fix: correct x-client-role header

disabled currently, enabled in v1.1.0

.github/ISSUE_TEMPLATE/bug--.md

@@ -1,20 +1,46 @@
 ---
 name: Bug汇报
-about: Create a report to help us improve
+about: 遇到了bug? 你可以在这里开始汇报（仅限软件本体问题）
 title: ''
-labels: ''
+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版本: v0.9.10
+go-cqhttp版本: 
-运行环境: windows_amd64
+运行环境: 
-连接方式: 反向WS
+连接方式: 
+使用协议: 
+
+**在最新的release版本中能否复现**
 
 **bug内容**
-请在这里详细描述bug的内容
+<!-- 请在这里详细描述bug的内容 -->
 
 **复现方法**
-请在这里分步骤的描述如何复现这个bug
+<!-- 请在这里分步骤的描述如何复现这个bug -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 不知道怎么做?
+    url: https://github.com/Mrs4s/go-cqhttp/issues/633
+    about: 建议你先查看此教程
+  - name: 讨论区
+    url: https://github.com/Mrs4s/go-cqhttp/discussions/
+    about: 使用中若遇到问题或有新点子新需求，请先在这里求助和征求意见。

.github/ISSUE_TEMPLATE/feat--.md

@@ -0,0 +1,15 @@
+---
+name: 新功能提议
+about: 提出新功能
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**环境信息**
+<!-- 请尽量填写 -->
+go-cqhttp版本: 
+
+**需要添加的功能内容**
+<!-- 请在这里详细描述新功能的实现方法 -->

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request]
+on: [push, pull_request,workflow_dispatch]
 
 env:
   BINARY_PREFIX: "go-cqhttp_"
@@ -14,41 +14,42 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64
+        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64, darwin/arm64
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
+        goarch: ["386", amd64, arm, arm64]
-        exclude: 
+        exclude:
           - goos: darwin
             goarch: arm
           - goos: darwin
             goarch: "386"
       fail-fast: true
-
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-
+      - name: Setup Go environment
-    - name: Setup Go environment
+        uses: actions/setup-go@v2.1.3
-      uses: actions/setup-go@v2.1.1
+        with:
-      with:
+          go-version: 1.17
-        go-version: 1.15
+      - name: Cache downloaded module
-    
+        uses: actions/cache@v2
-    - name: Build binary file
+        with:
-      env:
+          path: |
-        GOOS: ${{ matrix.goos }}
+            ~/.cache/go-build
-        GOARCH: ${{ matrix.goarch }}
+            ~/go/pkg/mod
-        IS_PR: ${{ !!github.head_ref }}
+          key: ${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}
-      run: |
+      - name: Build binary file
-        if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
+        env:
-        if $IS_PR ; then echo $PR_PROMPT; fi
+          GOOS: ${{ matrix.goos }}
-        export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
+          GOARCH: ${{ matrix.goarch }}
-        export CGO_ENABLED=0
+          IS_PR: ${{ !!github.head_ref }}
-        go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" .
+        run: |
-    
+          if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
-    - name: Upload artifact
+          if $IS_PR ; then echo $PR_PROMPT; fi
-      uses: actions/upload-artifact@v2
+          export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
-      if: ${{ !github.head_ref }}
+          export CGO_ENABLED=0
-      with:
+          go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
-        name: ${{ matrix.goos }}_${{ matrix.goarch }}
+      - name: Upload artifact
-        path: output/
+        uses: actions/upload-artifact@v2
-    
+        if: ${{ !github.head_ref }}
-    
+        with:
+          name: ${{ matrix.goos }}_${{ matrix.goarch }}
+          path: output/

.github/workflows/golint.yml

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

.github/workflows/issuebot.yml

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

.github/workflows/release.yml

@@ -1,33 +1,41 @@
+name: release
+
 on:
-  release:
+  push:
-    types: [created]
+    tags:
+      - 'v*'
 
 jobs:
-  releases-matrix:
+  goreleaser:
-    name: Release Go Binary
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
-        goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
-        exclude: 
-          - goos: darwin
-            goarch: arm
-          - goos: darwin
-            goarch: "386"
-            
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
-      - name: Set RELEASE_VERSION env
+        uses: actions/checkout@v2.3.4
-        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
-      - uses: pcrbot/go-release-action@master
-        env:
-          CGO_ENABLED: 0
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
-          goos: ${{ matrix.goos }}
+
-          goarch: ${{ matrix.goarch }}
+      - name: Set up Go
-          goversion: "https://golang.org/dl/go1.15.3.linux-amd64.tar.gz"
+        uses: actions/setup-go@v2
-          ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
+        with:
-          
+          go-version: '1.17'
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      #- name: Checkout Dist
+      #  uses: actions/checkout@v2
+      #  with:
+      #    repository: 'gocq/dist'
+      #    ref: master
+      #    ssh-key: ${{ secrets.SSH_KEY }}
+      #    path: upstream/dist
+
+      #- name: Update Dist
+      #  run: |
+      #    chmod +x scripts/upload_dist.sh
+      #    ./scripts/upload_dist.sh

.gitignore

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

.golangci.yml

@@ -0,0 +1,95 @@
+linters-settings:
+  errcheck:
+    ignore: fmt:.*,io/ioutil:^Read.*
+    ignoretests: true
+
+  goimports:
+    local-prefixes: github.com/Mrs4s/go-cqhttp
+
+  gocritic:
+    disabled-checks:
+      - exitAfterDefer
+
+  forbidigo:
+    # Forbid the following identifiers
+    forbid:
+      - ^fmt\.Errorf$ # consider errors.Errorf in github.com/pkg/errors
+
+linters:
+  # please, do not use `enable-all`: it's deprecated and will be removed soon.
+  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+  disable-all: true
+  fast: false
+  enable:
+    - bodyclose
+    - deadcode
+    - depguard
+    - dogsled
+    - dupl
+    - errcheck
+    - exportloopref
+    - exhaustive
+    #- funlen
+    #- goconst
+    - gocritic
+    #- gocyclo
+    - gofmt
+    - goimports
+    - goprintffuncname
+    #- gosec
+    - gosimple
+    - govet
+    - ineffassign
+    #- misspell
+    - nolintlint
+    - rowserrcheck
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - varcheck
+    - whitespace
+    - prealloc
+    - predeclared
+    - asciicheck
+    - revive
+    - forbidigo
+    - makezero
+    #- interfacer
+
+  # don't enable:
+  # - scopelint
+  # - gochecknoglobals
+  # - gocognit
+  # - godot
+  # - godox
+  # - goerr113
+  # - interfacer
+  # - maligned
+  # - nestif
+  # - testpackage
+  # - wsl
+
+run:
+  # default concurrency is a available CPU number.
+  # concurrency: 4 # explicitly omit this value to fully utilize available resources.
+  deadline: 5m
+  issues-exit-code: 1
+  tests: false
+
+# output configuration options
+output:
+  format: "colored-line-number"
+  print-issued-lines: true
+  print-linter-name: true
+  uniq-by-line: true
+
+issues:
+  # Fix found issues (if it's supported by the linter)
+  fix: true
+  exclude-use-default: false
+  exclude:
+    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"

.goreleaser.yml

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

CONTRIBUTING.md

@@ -0,0 +1,74 @@
+# Contributing to go-cqhttp
+
+想要成为 go-cqhttp 的 Contributor? Awesome!
+
+这个页面提供了一些 Tips ，可能对您的开发提供一些帮助.
+
+## 开发环境准备
+
+go-cqhttp 使用了 `golangci-lint` 检查可能的问题，规范代码风格，为了减少不必要的麻烦，
+我们推荐在开发环境中安装 `golangci-lint` 工具.
+
+```shell
+go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+```
+
+在提交代码前运行 `golangci-lint` 检查你的代码:
+
+```shell
+golangci-lint run
+```
+
+**注意**: `golangci-lint` 需要 `diff` 工具，在 windows 环境中，你可能需要使用 `Git Bash` 运行。
+
+## Pull requests
+
+首先，为了方便项目管理，请将您的 PR 推送至**dev**分支。
+
+### 检查 issue 列表
+
+不管你是已经明确了要提交什么代码，还是正在寻找一个想法，你都应该先到 issue 列表看一下。
+如果在 issue 中找到了感兴趣的，请在 issue 表明正在对这个 issue 进行开发。
+
+### 项目结构
+
+下面是 go-cqhttp 项目结构的简单介绍.
+
+<table class="tg">
+  <tr>
+    <td>coolq</td>
+    <td>
+      包含与 MiraiGo 交互部分， CQ码解析等部分
+    </td>
+  </tr>
+  <tr>
+    <td>server</td>
+    <td>
+      包含 http，ws 通信的实现部分
+    </td>
+  </tr>
+  <tr>
+    <td>global</td>
+    <td>
+      一个<del>实用的</del>工具包
+    </td>
+  </tr>
+  <tr>
+    <td>docs</td>
+    <td>
+      使用教程与文档
+    </td>
+  </tr>
+</table>
+
+## 社区准则
+为了让社区保持强大，不断发展，我们向整个社区提出了一些通用准则：
+
+**友善**：对社区成员要礼貌，尊重和礼貌。 请不要在社区中发布任何有关种族歧视、性别歧视、
+地域歧视、人格侮辱等言论。
+
+**鼓励参与**：在社区中讲礼貌的每个人都受到欢迎，无论他们的贡献程度如何，
+我们鼓励一切人参与(不一定需要提交代码) `go-cqhttp` 的开发。
+
+**紧贴主题**：请避免主题外的讨论。当您更新或回复时， 可能会给大量人员发送邮件，
+请牢记，没有人喜欢垃圾邮件。

Dockerfile

@@ -1,18 +1,21 @@
-FROM golang:1.14.7-alpine AS builder
+FROM golang:1.17-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
-  && mkdir /build
+  && go env -w GOPROXY=https://goproxy.cn,direct 
 
 WORKDIR /build
 
 COPY ./ .
 
-RUN cd /build \
+RUN set -ex \
-  && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
+    && cd /build \
+    && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
 
 FROM alpine:latest
 
+RUN apk add --no-cache ffmpeg
+
 COPY --from=builder /build/cqhttp /usr/bin/cqhttp
 RUN chmod +x /usr/bin/cqhttp
 

README.md

@@ -1,112 +1,290 @@
+<p align="center">
+  <a href="https://ishkong.github.io/go-cqhttp-docs/">
+    <img src="https://user-images.githubusercontent.com/25968335/120111974-8abef880-c139-11eb-99cd-fa928348b198.png" width="200" height="200" alt="go-cqhttp">
+  </a>
+</p>
+
+<div align="center">
+
 # go-cqhttp
-使用 [mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 开发的cqhttp golang原生实现, 并在[cqhttp原版](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
-文档暂时可查看 `docs` 目录， 目前还在撰写中.
 
-测试版可前往 Release 下载
+_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_  
 
-# 兼容性
 
-#### 接口
+</div>
+
+<p align="center">
+  <a href="https://raw.githubusercontent.com/Mrs4s/go-cqhttp/master/LICENSE">
+    <img src="https://img.shields.io/github/license/Mrs4s/go-cqhttp" alt="license">
+  </a>
+  <a href="https://github.com/Mrs4s/go-cqhttp/releases">
+    <img src="https://img.shields.io/github/v/release/Mrs4s/go-cqhttp?color=blueviolet&include_prereleases" alt="release">
+  </a>
+<a href="https://app.fossa.com/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp.svg?type=shield"/></a>
+  <a href="https://github.com/howmanybots/onebot/blob/master/README.md">
+    <img src="https://img.shields.io/badge/OneBot-v11-blue?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAAIVBMVEUAAAAAAAADAwMHBwceHh4UFBQNDQ0ZGRkoKCgvLy8iIiLWSdWYAAAAAXRSTlMAQObYZgAAAQVJREFUSMftlM0RgjAQhV+0ATYK6i1Xb+iMd0qgBEqgBEuwBOxU2QDKsjvojQPvkJ/ZL5sXkgWrFirK4MibYUdE3OR2nEpuKz1/q8CdNxNQgthZCXYVLjyoDQftaKuniHHWRnPh2GCUetR2/9HsMAXyUT4/3UHwtQT2AggSCGKeSAsFnxBIOuAggdh3AKTL7pDuCyABcMb0aQP7aM4AnAbc/wHwA5D2wDHTTe56gIIOUA/4YYV2e1sg713PXdZJAuncdZMAGkAukU9OAn40O849+0ornPwT93rphWF0mgAbauUrEOthlX8Zu7P5A6kZyKCJy75hhw1Mgr9RAUvX7A3csGqZegEdniCx30c3agAAAABJRU5ErkJggg==" alt="cqhttp">
+  </a>
+  <a href="https://github.com/Mrs4s/go-cqhttp/actions">
+    <img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action">
+  </a>
+  <a href="https://goreportcard.com/report/github.com/Mrs4s/go-cqhttp">
+  <img src="https://goreportcard.com/badge/github.com/Mrs4s/go-cqhttp" alt="GoReportCard">
+  </a>
+</p>
+
+<p align="center">
+  <a href="https://docs.go-cqhttp.org/">文档</a>
+  ·
+  <a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
+  ·
+  <a href="https://docs.go-cqhttp.org/guide/quick_start.html">开始使用</a>
+  ·
+  <a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a>
+</p>
+
+
+## 兼容性
+go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
+
+### 接口
+
 - [x] HTTP API
-- [x] 反向HTTP POST
+- [x] 反向 HTTP POST
-- [x] 正向Websocket
+- [x] 正向 WebSocket
-- [x] 反向Websocket
+- [x] 反向 WebSocket
 
-#### 拓展支持
+### 拓展支持
-> 拓展API可前往 [文档](docs/cqhttp.md) 查看
+
-- [x] HTTP POST多点上报
+> 拓展 API 可前往 [文档](docs/cqhttp.md) 查看
-- [x] 反向WS多点连接 
+
+- [x] HTTP POST 多点上报
+- [x] 反向 WS 多点连接
 - [x] 修改群名
 - [x] 消息撤回事件
 - [x] 解析/发送 回复消息
 - [x] 解析/发送 合并转发
-- [ ] 使用代理请求网络图片
+- [x] 使用代理请求网络图片
+
+### 实现
 
-#### 实现
 <details>
-<summary>已实现CQ码</summary>
+<summary>已实现 CQ 码</summary>
 
-- [CQ:image]
+#### 符合 OneBot 标准的 CQ 码
-- [CQ:record]
+
-- [CQ:video]
+| CQ 码        | 功能                        |
-- [CQ:face]
+| ------------ | --------------------------- |
-- [CQ:at]
+| [CQ:face]    | [QQ 表情]                   |
-- [CQ:share]
+| [CQ:record]  | [语音]                      |
-- [CQ:reply]
+| [CQ:video]   | [短视频]                    |
-- [CQ:forward]
+| [CQ:at]      | [@某人]                     |
-- [CQ:node]
+| [CQ:share]   | [链接分享]                  |
-- [CQ:gift]
+| [CQ:music]   | [音乐分享] [音乐自定义分享] |
-- [CQ:redbag]
+| [CQ:reply]   | [回复]                      |
-- [CQ:tts]
+| [CQ:forward] | [合并转发]                  |
-- [CQ:music]
+| [CQ:node]    | [合并转发节点]              |
+| [CQ:xml]     | [XML 消息]                  |
+| [CQ:json]    | [JSON 消息]                 |
+
+[qq 表情]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#qq-%E8%A1%A8%E6%83%85
+[语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E8%AF%AD%E9%9F%B3
+[短视频]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
+[@某人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E6%9F%90%E4%BA%BA
+[链接分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
+[音乐分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
+[音乐自定义分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
+[回复]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%9B%9E%E5%A4%8D
+[合并转发]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
+[合并转发节点]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
+[xml 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#xml-%E6%B6%88%E6%81%AF
+[json 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#json-%E6%B6%88%E6%81%AF
+
+#### 拓展 CQ 码及与 OneBot 标准有略微差异的 CQ 码
+
+| 拓展 CQ 码     | 功能                              |
+| -------------- | --------------------------------- |
+| [CQ:image]     | [图片]                            |
+| [CQ:redbag]    | [红包]                            |
+| [CQ:poke]      | [戳一戳]                          |
+| [CQ:gift]      | [礼物]                            |
+| [CQ:node]      | [合并转发消息节点]                |
+| [CQ:cardimage] | [一种 xml 的图片消息（装逼大图）] |
+| [CQ:tts]       | [文本转语音]                      |
+
+[图片]: https://docs.go-cqhttp.org/cqcode/#%E5%9B%BE%E7%89%87
+[红包]: https://docs.go-cqhttp.org/cqcode/#%E7%BA%A2%E5%8C%85
+[戳一戳]: https://docs.go-cqhttp.org/cqcode/#%E6%88%B3%E4%B8%80%E6%88%B3
+[礼物]: https://docs.go-cqhttp.org/cqcode/#%E7%A4%BC%E7%89%A9
+[合并转发消息节点]: https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9
+[一种 xml 的图片消息（装逼大图）]: https://docs.go-cqhttp.org/cqcode/#cardimage
+[文本转语音]: https://docs.go-cqhttp.org/cqcode/#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3
 
 </details>
 
 <details>
-<summary>已实现API</summary>
+<summary>已实现 API</summary>
 
-##### 注意: 部分API实现与CQHTTP原版略有差异，请参考文档
+#### 符合 OneBot 标准的 API
-| API                      | 功能                                                         |
+
-| ------------------------ | ------------------------------------------------------------ |
+| API                      | 功能                   |
-| /get_login_info          | [获取登录号信息](https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-获取登录号信息) |
+| ------------------------ | ---------------------- |
-| /get_friend_list         | [获取好友列表](https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-获取好友列表) |
+| /send_private_msg        | [发送私聊消息]         |
-| /get_group_list          | [获取群列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-获取群列表) |
+| /send_group_msg          | [发送群消息]           |
-| /get_group_info          | [获取群信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-获取群信息) |
+| /send_msg                | [发送消息]             |
-| /get_group_member_list   | [获取群成员列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-获取群成员列表) |
+| /delete_msg              | [撤回信息]             |
-| /get_group_member_info   | [获取群成员信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-获取群成员信息) |
+| /set_group_kick          | [群组踢人]             |
-| /send_msg                | [发送消息](https://cqhttp.cc/docs/4.15/#/API?id=send_msg-发送消息) |
+| /set_group_ban           | [群组单人禁言]         |
-| /send_group_msg          | [发送群消息](https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-发送群消息) |
+| /set_group_whole_ban     | [群组全员禁言]         |
-| /send_private_msg        | [发送私聊消息](https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-发送私聊消息) |
+| /set_group_admin         | [群组设置管理员]       |
-| /delete_msg              | [撤回信息](https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-撤回消息) |
+| /set_group_card          | [设置群名片（群备注）] |
-| /set_friend_add_request  | [处理加好友请求](https://cqhttp.cc/docs/4.15/#/API?id=set_friend_add_request-处理加好友请求) |
+| /set_group_name          | [设置群名]             |
-| /set_group_add_request   | [处理加群请求/邀请](https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-处理加群请求／邀请) |
+| /set_group_leave         | [退出群组]             |
-| /set_group_card          | [设置群名片(群备注)](https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-设置群名片（群备注）) |
+| /set_group_special_title | [设置群组专属头衔]     |
-| /set_group_special_title | [设置群组专属头衔](https://cqhttp.cc/docs/4.15/#/API?id=set_group_special_title-设置群组专属头衔) |
+| /set_friend_add_request  | [处理加好友请求]       |
-| /set_group_kick          | [群组T人](https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-群组踢人) |
+| /set_group_add_request   | [处理加群请求/邀请]    |
-| /set_group_ban           | [群组单人禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-群组单人禁言) |
+| /get_login_info          | [获取登录号信息]       |
-| /set_group_whole_ban     | [群组全员禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-群组全员禁言) |
+| /get_stranger_info       | [获取陌生人信息]       |
-| /set_group_leave         | [退出群组](https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-退出群组) |
+| /get_friend_list         | [获取好友列表]         |
-| /set_group_name          | 设置群组名(拓展API)                                         |
+| /get_group_info          | [获取群信息]           |
-| /get_image               | 获取图片信息(拓展API)                                        |
+| /get_group_list          | [获取群列表]           |
-| /get_msg                 | [获取消息]()                                        | <!-- TODO 来人补个链接-->
+| /get_group_member_info   | [获取群成员信息]       |
-| /can_send_image          | [检查是否可以发送图片](https://cqhttp.cc/docs/4.15/#/API?id=can_send_image-检查是否可以发送图片) |
+| /get_group_member_list   | [获取群成员列表]       |
-| /can_send_record         | [检查是否可以发送语音](https://cqhttp.cc/docs/4.15/#/API?id=can_send_record-检查是否可以发送语音) |
+| /get_group_honor_info    | [获取群荣誉信息]       |
-| /get_status              | [获取插件运行状态](https://cqhttp.cc/docs/4.15/#/API?id=get_status-获取插件运行状态) |
+| /can_send_image          | [检查是否可以发送图片] |
-| /get_version_info        | [获取 酷Q 及 CQHTTP插件的版本信息](https://cqhttp.cc/docs/4.15/#/API?id=get_version_info-获取-酷q-及-cqhttp-插件的版本信息) |
+| /can_send_record         | [检查是否可以发送语音] |
+| /get_version_info        | [获取版本信息]         |
+| /set_restart             | [重启 go-cqhttp]       |
+| /.handle_quick_operation | [对事件执行快速操作]   |
+
+[发送私聊消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[发送群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
+[发送消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
+[撤回信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
+[群组踢人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
+[群组单人禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
+[群组全员禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
+[群组设置管理员]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+[设置群名片（群备注）]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
+[设置群名]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
+[退出群组]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
+[设置群组专属头衔]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
+[处理加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[处理加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+[获取登录号信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
+[获取陌生人信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
+[获取好友列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
+[获取群信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
+[获取群列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
+[获取群成员信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+[获取群成员列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
+[获取群荣誉信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+[检查是否可以发送图片]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
+[检查是否可以发送语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
+[获取版本信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
+[重启 go-cqhttp]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
+[对事件执行快速操作]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
+
+#### 拓展 API 及与 OneBot 标准有略微差异的 API
+
+| 拓展 API                    | 功能                   |
+| --------------------------- | ---------------------- |
+| /set_group_portrait         | [设置群头像]           |
+| /get_image                  | [获取图片信息]         |
+| /get_msg                    | [获取消息]             |
+| /get_forward_msg            | [获取合并转发内容]     |
+| /send_group_forward_msg     | [发送合并转发(群)]     |
+| /.get_word_slices           | [获取中文分词]         |
+| /.ocr_image                 | [图片 OCR]             |
+| /get_group_system_msg       | [获取群系统消息]       |
+| /get_group_file_system_info | [获取群文件系统信息]   |
+| /get_group_root_files       | [获取群根目录文件列表] |
+| /get_group_files_by_folder  | [获取群子目录文件列表] |
+| /get_group_file_url         | [获取群文件资源链接]   |
+| /get_status                 | [获取状态]             |
+
+[设置群头像]: https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
+[获取图片信息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
+[获取消息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
+[获取合并转发内容]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E5%86%85%E5%AE%B9
+[发送合并转发(群)]: https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-%E7%BE%A4
+[获取中文分词]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D-%E9%9A%90%E8%97%8F-api
+[图片 ocr]: https://docs.go-cqhttp.org/api/#%E5%9B%BE%E7%89%87-ocr
+[获取群系统消息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
+[获取群文件系统信息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
+[获取群根目录文件列表]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群子目录文件列表]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群文件资源链接]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
+[获取状态]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%8A%B6%E6%80%81
 
 </details>
 
 <details>
-<summary>已实现Event</summary>
+<summary>已实现 Event</summary>
 
-##### 注意: 部分Event数据与CQHTTP原版略有差异，请参考文档
+#### 符合 OneBot 标准的 Event（部分 Event 比 OneBot 标准多上报几个字段，不影响使用）
-| Event                                                        |
+
-| ------------------------------------------------------------ |
+| 事件类型 | Event            |
-| [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息)   |
+| -------- | ---------------- |
-| [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息)       |
+| 消息事件 | [私聊信息]       |
-| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回)           |
+| 消息事件 | [群消息]         |
-| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回)       |
+| 通知事件 | [群文件上传]     |
-| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳)           |
+| 通知事件 | [群管理员变动]   |
-| [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) |
+| 通知事件 | [群成员减少]     |
-| [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
+| 通知事件 | [群成员增加]     |
-| [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
+| 通知事件 | [群禁言]         |
-| [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言)       |
+| 通知事件 | [好友添加]       |
-| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传) |
+| 通知事件 | [群消息撤回]     |
-| [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) |
+| 通知事件 | [好友消息撤回]   |
-| [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求／邀请) |
+| 通知事件 | [群内戳一戳]     |
+| 通知事件 | [群红包运气王]   |
+| 通知事件 | [群成员荣誉变更] |
+| 请求事件 | [加好友请求]     |
+| 请求事件 | [加群请求/邀请]  |
+
+[私聊信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
+[群文件上传]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
+[群管理员变动]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
+[群成员减少]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
+[群成员增加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
+[群禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
+[好友添加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
+[群消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[好友消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[群内戳一戳]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
+[群红包运气王]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
+[群成员荣誉变更]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
+[加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+
+#### 拓展 Event
+
+| 事件类型 | 拓展 Event       |
+| -------- | ---------------- |
+| 通知事件 | [好友戳一戳]     |
+| 通知事件 | [群内戳一戳]     |
+| 通知事件 | [群成员名片更新] |
+| 通知事件 | [接收到离线文件] |
+
+[好友戳一戳]: https://docs.go-cqhttp.org/event/#%E5%A5%BD%E5%8F%8B%E6%88%B3%E4%B8%80%E6%88%B3
+[群内戳一戳]: https://docs.go-cqhttp.org/event/#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
+[群成员名片更新]: https://docs.go-cqhttp.org/event/#%E7%BE%A4%E6%88%90%E5%91%98%E5%90%8D%E7%89%87%E6%9B%B4%E6%96%B0
+[接收到离线文件]: https://docs.go-cqhttp.org/event/#%E6%8E%A5%E6%94%B6%E5%88%B0%E7%A6%BB%E7%BA%BF%E6%96%87%E4%BB%B6
 
 </details>
 
-# 关于ISSUE
+## 关于 ISSUE
 
-以下ISSUE会被直接关闭
+以下 ISSUE 会被直接关闭
-- 提交BUG不使用Template
+
+- 提交 BUG 不使用 Template
 - 询问已知问题
 - 提问找不到重点
 - 重复提问
 
-> 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。
+> 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。  
+> 有关如何提问，请阅读[《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
 
-# 性能
+## 性能
 
-在关闭数据库的情况下, 加载25个好友128个群运行24小时后内存使用为10MB左右. 开启数据库后内存使用将根据消息量增加10-20MB, 如果系统内存小于128M建议关闭数据库使用. 
+在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

coolq/bot.go

@@ -3,44 +3,88 @@ package coolq
 import (
 	"bytes"
 	"encoding/gob"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/syndtr/goleveldb/leveldb"
 	"hash/crc32"
+	"io"
+	"os"
 	"path"
+	"runtime/debug"
 	"sync"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/MiraiGo/utils"
-
+	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
+// CQBot CQBot结构体,存储Bot实例相关配置
 type CQBot struct {
 	Client *client.QQClient
 
-	events         []func(MSG)
+	lock   sync.RWMutex
-	db             *leveldb.DB
+	events []func(*Event)
-	friendReqCache sync.Map
+
-	tempMsgCache   sync.Map
+	db               *leveldb.DB
-	oneWayMsgCache sync.Map
+	friendReqCache   sync.Map
+	tempSessionCache sync.Map
 }
 
-type MSG map[string]interface{}
+// Event 事件
+type Event struct {
+	RawMsg global.MSG
 
-var ForceFragmented = false
+	once   sync.Once
+	buffer *bytes.Buffer
+}
 
-func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
+func (e *Event) marshal() {
+	if e.buffer == nil {
+		e.buffer = global.NewBuffer()
+	}
+	_ = json.NewEncoder(e.buffer).Encode(e.RawMsg)
+}
+
+// JSONBytes return byes of json by lazy marshalling.
+func (e *Event) JSONBytes() []byte {
+	e.once.Do(e.marshal)
+	return e.buffer.Bytes()
+}
+
+// JSONString return string of json without extra allocation
+// by lazy marshalling.
+func (e *Event) JSONString() string {
+	e.once.Do(e.marshal)
+	return utils.B2S(e.buffer.Bytes())
+}
+
+// NewQQBot 初始化一个QQBot实例
+func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
-	if conf.EnableDB {
+	enableLevelDB := false
+	node, ok := base.Database["leveldb"]
+	if ok {
+		lconf := new(config.LevelDBConfig)
+		_ = node.Decode(lconf)
+		enableLevelDB = lconf.Enable
+	}
+	if enableLevelDB {
 		p := path.Join("data", "leveldb")
-		db, err := leveldb.OpenFile(p, nil)
+		db, err := leveldb.OpenFile(p, &opt.Options{
+			WriteBuffer: 128 * opt.KiB,
+		})
 		if err != nil {
 			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
 		}
@@ -52,11 +96,16 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
+	if base.ReportSelfMessage {
+		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
+		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
 	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
 	bot.Client.OnFriendNotify(bot.friendNotifyEvent)
+	bot.Client.OnMemberSpecialTitleUpdated(bot.memberTitleUpdatedEvent)
 	bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
 	bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
 	bot.Client.OnJoinGroup(bot.joinGroupEvent)
@@ -69,42 +118,43 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
 	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
 	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
+	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
+	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		i := conf.HeartbeatInterval
+		if base.HeartbeatInterval == 0 {
-		if i < 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
-		if i == 0 {
+		t := time.NewTicker(base.HeartbeatInterval)
-			i = 5
-		}
 		for {
-			time.Sleep(time.Second * i)
+			<-t.C
-			bot.dispatchEventMessage(MSG{
+			bot.dispatchEventMessage(global.MSG{
 				"time":            time.Now().Unix(),
 				"self_id":         bot.Client.Uin,
 				"post_type":       "meta_event",
 				"meta_event_type": "heartbeat",
-				"status":          nil,
+				"status":          bot.CQGetStatus()["data"],
-				"interval":        1000 * i,
+				"interval":        base.HeartbeatInterval.Milliseconds(),
 			})
 		}
 	}()
 	return bot
 }
 
-func (bot *CQBot) OnEventPush(f func(m MSG)) {
+// OnEventPush 注册事件上报函数
+func (bot *CQBot) OnEventPush(f func(e *Event)) {
+	bot.lock.Lock()
 	bot.events = append(bot.events, f)
+	bot.lock.Unlock()
 }
 
-func (bot *CQBot) GetMessage(mid int32) MSG {
+// GetMessage 获取给定消息id对应的消息
+func (bot *CQBot) GetMessage(mid int32) global.MSG {
 	if bot.db != nil {
-		m := MSG{}
+		m := global.MSG{}
 		data, err := bot.db.Get(binary.ToBytes(mid), nil)
 		if err == nil {
-			buff := new(bytes.Buffer)
+			err = gob.NewDecoder(bytes.NewReader(data)).Decode(&m)
-			buff.Write(binary.GZipUncompress(data))
-			err = gob.NewDecoder(buff).Decode(&m)
 			if err == nil {
 				return m
 			}
@@ -114,101 +164,97 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 	return nil
 }
 
-func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int32 {
+// UploadLocalImageAsGroup 上传本地图片至群聊
-	var newElem []message.IMessageElement
+func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
-	for _, elem := range m.Elements {
+	if img.File != "" {
-		if i, ok := elem.(*message.ImageElement); ok {
+		f, err := os.Open(img.File)
-			gm, err := bot.Client.UploadGroupImage(groupId, i.Data)
+		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)
+	}
+	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
+	if i != nil {
+		i.Flash = img.Flash
+		i.EffectID = img.EffectID
+	}
+	return
+}
+
+// UploadLocalVideo 上传本地短视频至群聊
+func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
+	video, err := os.Open(v.File)
+	if err != nil {
+		return nil, err
+	}
+	defer video.Close()
+	hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
+	cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
+	_, _ = video.Seek(0, io.SeekStart)
+	_, _ = v.thumb.Seek(0, io.SeekStart)
+	return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+}
+
+// UploadLocalImageAsPrivate 上传本地图片至私聊
+func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
+	if img.File != "" {
+		f, err := os.Open(img.File)
+		if err != nil {
+			return nil, errors.Wrap(err, "open image error")
+		}
+		defer func() { _ = f.Close() }()
+		img.Stream = f
+	}
+	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
+		return nil, errors.New("image type error: " + mime)
+	}
+	i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
+	if i != nil {
+		i.Flash = img.Flash
+	}
+	return
+}
+
+// SendGroupMessage 发送群消息
+func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	group := bot.Client.FindGroup(groupID)
+	for _, e := range m.Elements {
+		switch i := e.(type) {
+		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
+			i, err := bot.uploadMedia(i, groupID, true)
 			if err != nil {
-				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err)
+				log.Warnf("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
 				continue
 			}
-			newElem = append(newElem, gm)
+			e = i
-			continue
+		case *PokeElement:
-		}
+			if group != nil {
-		if i, ok := elem.(*message.VoiceElement); ok {
-			gv, err := bot.Client.UploadGroupPtt(groupId, i.Data)
-			if err != nil {
-				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
-				continue
-			}
-			newElem = append(newElem, gv)
-			continue
-		}
-		if i, ok := elem.(*PokeElement); ok {
-			if group := bot.Client.FindGroup(groupId); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
-					return 0
 				}
 			}
-		}
-		if i, ok := elem.(*GiftElement); ok {
-			bot.Client.SendGroupGift(uint64(groupId), uint64(i.Target), i.GiftId)
 			return 0
-		}
+		case *GiftElement:
-		if i, ok := elem.(*QQMusicElement); ok {
+			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
-			var msgStyle uint32 = 4
+			return 0
-			if i.MusicUrl == "" {
+		case *message.MusicShareElement:
-				msgStyle = 0 // fix vip song
+			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
-			}
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 100497308, 1, msgStyle, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.tencent.qqmusic",
-				Signature:   "cbd27cd7c861227d013a25b2d10f0799",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
 			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
+				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
 				return -1
 			}
 			return bot.InsertGroupMessage(ret)
-		}
+		case *message.AtElement:
-		if i, ok := elem.(*CloudMusicElement); ok {
+			if i.Target == 0 && group.SelfPermission() == client.Member {
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 100495085, 1, 4, client.RichClientInfo{
+				e = message.NewText("@全体成员")
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.netease.cloudmusic",
-				Signature:   "da6b069da1e2982db3e386233f68d76d",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
-				return -1
 			}
-			return bot.InsertGroupMessage(ret)
 		}
-		if i, ok := elem.(*MiguMusicElement); ok {
+		newElem = append(newElem, e)
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 1101053067, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "cmccwm.mobilemusic",
-				Signature:   "6cdc72a439cef99a3418d2a78aa28c73",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
-				return -1
-			}
-			return bot.InsertGroupMessage(ret)
-		}
-		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
@@ -216,7 +262,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem)
-	ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
+	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
 		return -1
@@ -224,81 +270,26 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 	return bot.InsertGroupMessage(ret)
 }
 
-func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 {
+// SendPrivateMessage 发送私聊消息
-	var newElem []message.IMessageElement
+func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
-	for _, elem := range m.Elements {
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
-		if i, ok := elem.(*message.ImageElement); ok {
+	for _, e := range m.Elements {
-			fm, err := bot.Client.UploadPrivateImage(target, i.Data)
+		switch i := e.(type) {
+		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
+			i, err := bot.uploadMedia(i, target, false)
 			if err != nil {
-				log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
+				log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
 				continue
 			}
-			newElem = append(newElem, fm)
+			e = i
-			continue
+		case *PokeElement:
-		}
-		if i, ok := elem.(*PokeElement); ok {
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
-		}
+		case *message.MusicShareElement:
-		if i, ok := elem.(*message.VoiceElement); ok {
+			bot.Client.SendFriendMusicShare(target, i)
-			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
-			if err != nil {
-				log.Warnf("警告: 好友 %v 消息语音上传失败: %v", target, err)
-				continue
-			}
-			newElem = append(newElem, fv)
-			continue
-		}
-		if i, ok := elem.(*QQMusicElement); ok {
-			var msgStyle uint32 = 4
-			if i.MusicUrl == "" {
-				msgStyle = 0 // fix vip song
-			}
-			bot.Client.SendFriendRichMessage(target, 100497308, 1, msgStyle, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.tencent.qqmusic",
-				Signature:   "cbd27cd7c861227d013a25b2d10f0799",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
 			return 0
 		}
-		if i, ok := elem.(*CloudMusicElement); ok {
+		newElem = append(newElem, e)
-			bot.Client.SendFriendRichMessage(target, 100495085, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.netease.cloudmusic",
-				Signature:   "da6b069da1e2982db3e386233f68d76d",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			return 0
-		}
-		if i, ok := elem.(*MiguMusicElement); ok {
-			bot.Client.SendFriendRichMessage(target, 1101053067, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "cmccwm.mobilemusic",
-				Signature:   "6cdc72a439cef99a3418d2a78aa28c73",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			return 0
-		}
-		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("好友消息发送失败: 消息为空.")
@@ -306,31 +297,73 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem)
-	var id int32 = -1
+
-	if bot.Client.FindFriend(target) != nil { // 双向好友
+	// 单向好友是否存在
-		msg := bot.Client.SendPrivateMessage(target, m)
+	unidirectionalFriendExists := func() bool {
-		if msg != nil {
+		list, err := bot.Client.GetUnidirectionalFriendList()
-			id = bot.InsertPrivateMessage(msg)
+		if err != nil {
+			return false
 		}
-	} else if code, ok := bot.tempMsgCache.Load(target); ok { // 临时会话
+		for _, f := range list {
-		msg := bot.Client.SendTempMessage(code.(int64), target, m)
+			if f.Uin == target {
-		if msg != nil {
+				return true
-			id = msg.Id
+			}
-		}
-	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
-		msg := bot.Client.SendPrivateMessage(target, m)
-		if msg != nil {
-			id = bot.InsertPrivateMessage(msg)
 		}
+		return false
 	}
-	if id == -1 {
+
-		return -1
+	session, ok := bot.tempSessionCache.Load(target)
+	var id int32 = -1
+
+	switch {
+	case bot.Client.FindFriend(target) != nil: // 双向好友
+		msg := bot.Client.SendPrivateMessage(target, m)
+		if msg != nil {
+			id = bot.InsertPrivateMessage(msg)
+		}
+	case ok || groupID != 0: // 临时会话
+		switch {
+		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
+			log.Errorf("错误: 找不到群(%v)", groupID)
+		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
+			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
+		case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
+			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
+		default:
+			if session == nil && groupID != 0 {
+				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
+				if msg != nil {
+					id = bot.InsertTempMessage(target, msg)
+				}
+				break
+			}
+			msg, err := session.(*client.TempSessionInfo).SendMessage(m)
+			if err != nil {
+				log.Errorf("发送临时会话消息失败: %v", err)
+				break
+			}
+			if msg != nil {
+				id = bot.InsertTempMessage(target, msg)
+			}
+		}
+	case unidirectionalFriendExists(): // 单向好友
+		msg := bot.Client.SendPrivateMessage(target, m)
+		if msg != nil {
+			id = bot.InsertPrivateMessage(msg)
+		}
+	default:
+		nickname := "Unknown"
+		if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
+			nickname = summaryInfo.Nickname
+		}
+		log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
 	}
 	return id
 }
 
+// InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
-	val := MSG{
+	val := global.MSG{
 		"message-id":  m.Id,
 		"internal-id": m.InternalId,
 		"group":       m.GroupCode,
@@ -339,14 +372,15 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 		"time":        m.Time,
 		"message":     ToStringMessage(m.Elements, m.GroupCode, true),
 	}
-	id := ToGlobalId(m.GroupCode, m.Id)
+	id := toGlobalID(m.GroupCode, m.Id)
 	if bot.db != nil {
-		buf := new(bytes.Buffer)
+		buf := global.NewBuffer()
+		defer global.PutBuffer(buf)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
@@ -354,23 +388,25 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	return id
 }
 
+// InsertPrivateMessage 私聊消息入数据库
 func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
-	val := MSG{
+	val := global.MSG{
 		"message-id":  m.Id,
 		"internal-id": m.InternalId,
 		"target":      m.Target,
 		"sender":      m.Sender,
 		"time":        m.Time,
-		"message":     ToStringMessage(m.Elements, m.Sender.Uin, true),
+		"message":     ToStringMessage(m.Elements, 0, true),
 	}
-	id := ToGlobalId(m.Sender.Uin, m.Id)
+	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
-		buf := new(bytes.Buffer)
+		buf := global.NewBuffer()
+		defer global.PutBuffer(buf)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
@@ -378,34 +414,142 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	return id
 }
 
-func ToGlobalId(code int64, msgId int32) int32 {
+// InsertTempMessage 临时消息入数据库
-	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgId))))
+func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
+	val := global.MSG{
+		"message-id": m.Id,
+		// FIXME(InsertTempMessage) InternalId missing
+		"from-group": m.GroupCode,
+		"group-name": m.GroupName,
+		"target":     target,
+		"sender":     m.Sender,
+		"time":       int32(time.Now().Unix()),
+		"message":    ToStringMessage(m.Elements, 0, true),
+	}
+	id := toGlobalID(m.Sender.Uin, m.Id)
+	if bot.db != nil {
+		buf := global.NewBuffer()
+		defer global.PutBuffer(buf)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+	}
+	return id
 }
 
+// toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
+func toGlobalID(code int64, msgID int32) int32 {
+	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
+}
+
+// Release 释放Bot实例
 func (bot *CQBot) Release() {
 	if bot.db != nil {
 		_ = bot.db.Close()
 	}
 }
 
-func (bot *CQBot) dispatchEventMessage(m MSG) {
+func (bot *CQBot) dispatchEventMessage(m global.MSG) {
-	payload := gjson.Parse(m.ToJson())
+	bot.lock.RLock()
-	filter := global.EventFilter
+	defer bot.lock.RUnlock()
-	if filter != nil && (*filter).Eval(payload) == false {
+
-		log.Debug("Event filtered!")
+	event := &Event{RawMsg: m}
-		return
+	wg := sync.WaitGroup{}
-	}
+	wg.Add(len(bot.events))
 	for _, f := range bot.events {
-		fn := f
+		go func(fn func(*Event)) {
-		go func() {
+			defer func() {
+				wg.Done()
+				if pan := recover(); pan != nil {
+					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
+				}
+			}()
+
 			start := time.Now()
-			fn(m)
+			fn(event)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
 			}
-		}()
+		}(f)
 	}
+	wg.Wait()
+	global.PutBuffer(event.buffer)
+}
+
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
+	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
+	gm := global.MSG{
+		"anonymous":    nil,
+		"font":         0,
+		"group_id":     m.GroupCode,
+		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
+		"message_type": "group",
+		"message_seq":  m.Id,
+		"post_type": func() string {
+			if m.Sender.Uin == bot.Client.Uin {
+				return "message_sent"
+			}
+			return "message"
+		}(),
+		"raw_message": cqm,
+		"self_id":     bot.Client.Uin,
+		"sender": global.MSG{
+			"age":     0,
+			"area":    "",
+			"level":   "",
+			"sex":     "unknown",
+			"user_id": m.Sender.Uin,
+		},
+		"sub_type": "normal",
+		"time":     m.Time,
+		"user_id":  m.Sender.Uin,
+	}
+	if 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 {
@@ -419,7 +563,20 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 
-func (m MSG) ToJson() string {
+func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group bool) (message.IMessageElement, error) {
-	b, _ := json.Marshal(m)
+	switch m := raw.(type) {
-	return string(b)
+	case *LocalImageElement:
+		if group {
+			return bot.UploadLocalImageAsGroup(target, m)
+		}
+		return bot.UploadLocalImageAsPrivate(target, m)
+	case *message.VoiceElement:
+		if group {
+			return bot.Client.UploadGroupPtt(target, bytes.NewReader(m.Data))
+		}
+		return bot.Client.UploadPrivatePtt(target, bytes.NewReader(m.Data))
+	case *LocalVideoElement:
+		return bot.UploadLocalVideo(target, m)
+	}
+	return nil, errors.New("unsupported message element type")
 }

coolq/cqcode_test.go

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

coolq/doc.go

@@ -0,0 +1,2 @@
+// Package coolq 包含CQBot实例,CQ码处理,消息发送,消息处理等的相关函数与结构体
+package coolq

coolq/event.go

@@ -2,56 +2,57 @@ package coolq
 
 import (
 	"encoding/hex"
-	"github.com/Mrs4s/MiraiGo/binary"
+	"os"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
 	"path"
 	"strconv"
 	"strings"
 	"time"
+
+	"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"
 )
 
-var format = "string"
+// ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-
+func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r interface{}) {
-func SetMessageFormat(f string) {
+	if base.PostFormat == "string" {
-	format = f
+		r = ToStringMessage(e, groupID, isRaw...)
-}
+	} else if base.PostFormat == "array" {
-
+		r = ToArrayMessage(e, groupID)
-func ToFormattedMessage(e []message.IMessageElement, code int64, raw ...bool) (r interface{}) {
-	if format == "string" {
-		r = ToStringMessage(e, code, raw...)
-	} else if format == "array" {
-		r = ToArrayMessage(e, code, raw...)
 	}
 	return
 }
 
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
+	cqm := ToStringMessage(m.Elements, 0, true)
-	if !m.Sender.IsFriend {
-		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
-	}
 	id := m.Id
 	if bot.db != nil {
 		id = bot.InsertPrivateMessage(m)
 	}
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
-	fm := MSG{
+	fm := global.MSG{
-		"post_type":    "message",
+		"post_type": func() string {
+			if m.Sender.Uin == bot.Client.Uin {
+				return "message_sent"
+			}
+			return "message"
+		}(),
 		"message_type": "private",
 		"sub_type":     "friend",
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
+		"target_id":    m.Target,
+		"message":      ToFormattedMessage(m.Elements, 0, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": MSG{
+		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"nickname": m.Sender.Nickname,
 			"sex":      "unknown",
@@ -66,12 +67,12 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	for _, elem := range m.Elements {
 		if file, ok := elem.(*message.GroupFileElement); ok {
 			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
-			bot.dispatchEventMessage(MSG{
+			bot.dispatchEventMessage(global.MSG{
 				"post_type":   "notice",
 				"notice_type": "group_upload",
 				"group_id":    m.GroupCode,
 				"user_id":     m.Sender.Uin,
-				"file": MSG{
+				"file": global.MSG{
 					"id":    file.Path,
 					"name":  file.Name,
 					"size":  file.Size,
@@ -90,73 +91,39 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 		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 := MSG{
+	gm := bot.formatGroupMessage(m)
-		"anonymous":    nil,
+	if gm == nil {
-		"font":         0,
+		return
-		"group_id":     m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
-		"message_id":   id,
-		"message_type": "group",
-		"post_type":    "message",
-		"raw_message":  cqm,
-		"self_id":      c.Uin,
-		"sender": MSG{
-			"age":     0,
-			"area":    "",
-			"level":   "",
-			"sex":     "unknown",
-			"user_id": m.Sender.Uin,
-		},
-		"sub_type": "normal",
-		"time":     time.Now().Unix(),
-		"user_id":  m.Sender.Uin,
-	}
-	if m.Sender.IsAnonymous() {
-		gm["anonymous"] = MSG{
-			"flag": "",
-			"id":   0,
-			"name": m.Sender.Nickname,
-		}
-		gm["sender"].(MSG)["nickname"] = "匿名消息"
-		gm["sub_type"] = "anonymous"
-	} else {
-		mem := c.FindGroup(m.GroupCode).FindMember(m.Sender.Uin)
-		ms := gm["sender"].(MSG)
-		ms["role"] = func() string {
-			switch mem.Permission {
-			case client.Owner:
-				return "owner"
-			case client.Administrator:
-				return "admin"
-			default:
-				return "member"
-			}
-		}()
-		ms["nickname"] = mem.Nickname
-		ms["card"] = mem.CardName
-		ms["title"] = mem.SpecialTitle
 	}
+	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
 }
 
-func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
+func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
+	m := e.Message
 	bot.checkMedia(m.Elements)
 	cqm := ToStringMessage(m.Elements, 0, true)
-	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
+	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	}
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
-	tm := MSG{
+	tm := global.MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
-		"message_id":   m.Id,
+		"temp_source":  e.Session.Source,
+		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"message":      ToFormattedMessage(m.Elements, 0, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": MSG{
+		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
+			"group_id": m.GroupCode,
 			"nickname": m.Sender.Nickname,
 			"sex":      "unknown",
 			"age":      0,
@@ -185,7 +152,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 		}
 	}
 
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"duration":    e.Time,
 		"group_id":    e.GroupCode,
@@ -205,10 +172,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 
 func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := ToGlobalId(e.GroupCode, e.MessageId)
+	gid := toGlobalID(e.GroupCode, e.MessageId)
 	log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
 		formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"group_id":    e.GroupCode,
 		"notice_type": "group_recall",
@@ -227,7 +194,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		sender := group.FindMember(notify.Sender)
 		receiver := group.FindMember(notify.Receiver)
 		log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -242,7 +209,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		sender := group.FindMember(notify.Sender)
 		luckyKing := group.FindMember(notify.LuckyKing)
 		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -255,7 +222,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		})
 	case *client.MemberHonorChangedNotifyEvent:
 		log.Info(notify.Content())
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -271,6 +238,10 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 					return "performer"
 				case client.Emotion:
 					return "emotion"
+				case client.Legend:
+					return "legend"
+				case client.StrongNewbie:
+					return "strong_newbie"
 				default:
 					return "ERROR"
 				}
@@ -281,10 +252,13 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 
 func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	friend := c.FindFriend(e.From())
-	switch notify := e.(type) {
+	if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
-	case *client.FriendPokeNotifyEvent:
+		if notify.Receiver == notify.Sender {
-		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
+			log.Infof("好友 %v 戳了戳自己.", friend.Nickname)
-		bot.dispatchEventMessage(MSG{
+		} else {
+			log.Infof("好友 %v 戳了戳你.", friend.Nickname)
+		}
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"notice_type": "notify",
 			"sub_type":    "poke",
@@ -297,15 +271,31 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	}
 }
 
+func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSpecialTitleUpdatedEvent) {
+	group := c.FindGroup(e.GroupCode)
+	mem := group.FindMember(e.Uin)
+	log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.Name, group.Code, mem.DisplayName(), mem.Uin, e.NewTitle)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":   "notice",
+		"notice_type": "notify",
+		"sub_type":    "title",
+		"group_id":    group.Code,
+		"self_id":     c.Uin,
+		"user_id":     e.Uin,
+		"time":        time.Now().Unix(),
+		"title":       e.NewTitle,
+	})
+}
+
 func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
 	f := c.FindFriend(e.FriendUin)
-	gid := ToGlobalId(e.FriendUin, e.MessageId)
+	gid := toGlobalID(e.FriendUin, e.MessageId)
 	if f != nil {
 		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
 	} else {
 		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
 	}
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_recall",
 		"self_id":     c.Uin,
@@ -321,11 +311,11 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
 		return
 	}
 	log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "offline_file",
 		"user_id":     e.Sender,
-		"file": MSG{
+		"file": global.MSG{
 			"name": e.FileName,
 			"size": e.FileSize,
 			"url":  e.DownloadUrl,
@@ -356,7 +346,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 		}
 		return "unset"
 	}()
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_admin",
 		"sub_type":    st,
@@ -369,7 +359,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 
 func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
 	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_card",
 		"group_id":    e.Group.Code,
@@ -381,12 +371,12 @@ func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCar
 	})
 }
 
-func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *client.MemberJoinGroupEvent) {
+func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
 	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
 	bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
 }
 
-func (bot *CQBot) memberLeaveEvent(c *client.QQClient, e *client.MemberLeaveGroupEvent) {
+func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
 	if e.Operator != nil {
 		log.Infof("成员 %v 被 %v T出了群 %v.", formatMemberName(e.Member), formatMemberName(e.Operator), formatGroupName(e.Group))
 	} else {
@@ -399,7 +389,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.friendReqCache.Store(flag, e)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "friend",
 		"user_id":      e.RequesterUin,
@@ -412,8 +402,8 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 
 func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
 	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
-	bot.tempMsgCache.Delete(e.Friend.Uin)
+	bot.tempSessionCache.Delete(e.Friend.Uin)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_add",
 		"self_id":     c.Uin,
@@ -425,7 +415,7 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "invite",
@@ -441,7 +431,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "add",
@@ -454,8 +444,69 @@ func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupR
 	})
 }
 
-func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
+func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.OtherClientStatusChangedEvent) {
-	return MSG{
+	if e.Online {
+		log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
+	} else {
+		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
+	}
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":   "notice",
+		"notice_type": "client_status",
+		"online":      e.Online,
+		"client": global.MSG{
+			"app_id":      e.Client.AppId,
+			"device_name": e.Client.DeviceName,
+			"device_kind": e.Client.DeviceKind,
+		},
+		"self_id": c.Uin,
+		"time":    time.Now().Unix(),
+	})
+}
+
+func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
+	g := c.FindGroup(e.GroupCode)
+	gid := toGlobalID(e.GroupCode, e.MessageID)
+	if e.OperationType == 1 {
+		log.Infof(
+			"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
+			formatGroupName(g),
+			formatMemberName(g.FindMember(e.OperatorUin)),
+			formatMemberName(g.FindMember(e.SenderUin)),
+			gid,
+		)
+	} else {
+		log.Infof(
+			"群 %v 内 %v 将 %v 的消息(%v)移出了精华消息.",
+			formatGroupName(g),
+			formatMemberName(g.FindMember(e.OperatorUin)),
+			formatMemberName(g.FindMember(e.SenderUin)),
+			gid,
+		)
+	}
+	if e.OperatorUin == bot.Client.Uin {
+		return
+	}
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":   "notice",
+		"group_id":    e.GroupCode,
+		"notice_type": "essence",
+		"sub_type": func() string {
+			if e.OperationType == 1 {
+				return "add"
+			}
+			return "delete"
+		}(),
+		"self_id":     c.Uin,
+		"sender_id":   e.SenderUin,
+		"operator_id": e.OperatorUin,
+		"time":        time.Now().Unix(),
+		"message_id":  gid,
+	})
+}
+
+func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
+	return global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_increase",
 		"group_id":    groupCode,
@@ -467,8 +518,8 @@ func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
 	}
 }
 
-func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) MSG {
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) global.MSG {
-	return MSG{
+	return global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_decrease",
 		"group_id":    groupCode,
@@ -496,57 +547,48 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 	for _, elem := range e {
 		switch i := elem.(type) {
-		case *message.ImageElement:
-			filename := hex.EncodeToString(i.Md5) + ".image"
-			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
-				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
-					w.Write(i.Md5)
-					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(i.Filename)
-					w.WriteString(i.Url)
-				}), 0644)
-			}
-			i.Filename = filename
 		case *message.GroupImageElement:
 			filename := hex.EncodeToString(i.Md5) + ".image"
-			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(filename)
+					w.WriteString(i.ImageId)
 					w.WriteString(i.Url)
-				}), 0644)
+				}), 0o644)
 			}
 		case *message.FriendImageElement:
 			filename := hex.EncodeToString(i.Md5) + ".image"
-			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
-					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
+					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(filename)
+					w.WriteString(i.ImageId)
 					w.WriteString(i.Url)
-				}), 0644)
+				}), 0o644)
 			}
 		case *message.VoiceElement:
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
-			if !global.PathExists(path.Join(global.VOICE_PATH, i.Name)) {
+			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
 				b, err := global.GetBytes(i.Url)
 				if err != nil {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = ioutil.WriteFile(path.Join(global.VOICE_PATH, i.Name), b, 0644)
+				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
 			}
 		case *message.ShortVideoElement:
 			filename := hex.EncodeToString(i.Md5) + ".video"
-			if !global.PathExists(path.Join(global.VIDEO_PATH, filename)) {
+			if !global.PathExists(path.Join(global.VideoPath, filename)) {
-				_ = ioutil.WriteFile(path.Join(global.VIDEO_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = os.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
+					w.Write(i.ThumbMd5)
 					w.WriteUInt32(uint32(i.Size))
+					w.WriteUInt32(uint32(i.ThumbSize))
 					w.WriteString(i.Name)
 					w.Write(i.Uuid)
-				}), 0644)
+				}), 0o644)
 			}
 			i.Name = filename
 			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)

docs/EventFilter.md

@@ -1,12 +1,22 @@
 # 事件过滤器
 
-在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则会暂停所有上报。
+在配置文件填写对应通信方式的 `middlewares.filter` 即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则不会启用事件过滤器。
 事件过滤器会处理所有事件(包括心跳事件在内的元事件),请谨慎使用！！
 
+注意: 与客户端建立连接的握手事件**不会**经过事件过滤器
+
 ## 示例
 
 这节首先给出一些示例，演示过滤器的基本用法，下一节将给出具体语法说明。
 
+### 过滤所有事件
+
+```json
+{
+    ".not": {}
+}
+```
+
 ### 只上报以「!!」开头的消息
 
 ```json
@@ -104,22 +114,51 @@
 }
 ```
 
+## 进阶指南
+
+1. 对于嵌套的值，可以使用 `.` 进行简化，如
+
+```json
+{
+    "sender": {
+        "sex": "male"
+    }
+}
+```
+
+与下面的配置文件作用相同
+
+```json
+{
+  "sender.sex": "male"
+}
+```
+
+2. 对于数组，可以使用数字索引，如
+```json
+{
+  "message.0.type": "text"
+}
+```
+
+更多进阶语法请参考[GJSON语法](https://github.com/tidwall/gjson/blob/master/SYNTAX.md)
+
 ## 语法说明
 
 过滤规则最外层是一个 JSON 对象，其中的键，如果以 `.`（点号）开头，则表示运算符，其值为运算符的参数，如果不以 `.` 开头，则表示对事件数据对象中相应键的过滤。过滤规则中任何一个对象，只有在它的所有项都匹配的情况下，才会让事件通过（等价于一个 `and` 运算）；其中，不以 `.` 开头的键，若其值不是对象，则只有在这个值和事件数据相应值相等的情况下，才会通过（等价于一个 `eq` 运算符）。
 
 下面列出所有运算符（「要求的参数类型」是指运算符的键所对应的值的类型，「可作用于的类型」是指在过滤时事件对象相应值的类型）：
 
-| 运算符 | 要求的参数类型 | 可作用于的类型 |
+| 运算符      | 要求的参数类型             | 可作用于的类型                                        |
-| ----- | ------------ | ----------- |
+| ----------- | -------------------------- | ----------------------------------------------------- |
-| `.not` | object | 任何 |
+| `.not`      | object                     | 任何                                                  |
-| `.and` | object | 若参数中全为运算符，则任何；若不全为运算符，则 object |
+| `.and`      | object                     | 若参数中全为运算符，则任何；若不全为运算符，则 object |
-| `.or` | array（数组元素为 object） | 任何 |
+| `.or`       | array（数组元素为 object） | 任何                                                  |
-| `.eq` | 任何 | 任何 |
+| `.eq`       | 任何                       | 任何                                                  |
-| `.neq` | 任何 | 任何 |
+| `.neq`      | 任何                       | 任何                                                  |
-| `.in` | string/array | 若参数为 string，则 string；若参数为 array，则任何 |
+| `.in`       | string/array               | 若参数为 string，则 string；若参数为 array，则任何    |
-| `.contains` | string | string |
+| `.contains` | string                     | string                                                |
-| `.regex` | string | string |
+| `.regex`    | string                     | string                                                |
 
 
 ## 过滤时的事件数据对象
@@ -128,5 +167,5 @@
 
 这里有几点需要注意：
 
-- `message` 字段在运行过滤器时是消息段数组的形式（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
+- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
 - `raw_message` 字段为未经**CQ码**处理的原始消息字符串，这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

docs/README.md

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

docs/adminApi.md

@@ -6,9 +6,9 @@
 
 参数:
 
-| 参数名 | 类型   | 说明        |
+| 参数名       | 类型   | 说明                        |
-| ------ | ------ | ----------- |
+| ------------ | ------ | --------------------------- |
-| access_token  | string | 校验口令，config.json中配置 |
+| access_token | string | 校验口令，config.hjson中配置 |
 
 
 
@@ -24,9 +24,9 @@ method：`POST/GET`
 
 参数:
 
-| 参数名 | 类型 | 说明                                  |
+| 参数名 | 类型 | 说明 |
-| ------ | ---- | ------------------------------------- |
+| ------ | ---- | ---- |
-| 无|||
+| 无     |      |      |
 
 返回：
 
@@ -44,19 +44,19 @@ method: `GET`
 
 参数:
 
-| 参数名 | 类型   | 说明        |
+| 参数名 | 类型 | 说明 |
-| ------ | ------ | ----------- |
+| ------ | ---- | ---- |
-| 无|||
+| 无     |      |      |
 
 返回：
 
 ```json
 {"data": {"ispic": true,"picbase64":"xxxxx"}, "retcode": 0, "status": "ok"}
 ```
-| 参数名 | 类型   | 说明        |
+| 参数名   | 类型   | 说明                                                |
-| ------ | ------ | ----------- |
+| -------- | ------ | --------------------------------------------------- |
-| ispic| bool| 是否是验证码类型 true是，false为不是（比如设备锁|
+| ispic    | bool   | 是否是验证码类型 true是，false为不是（比如设备锁    |
-|picbas64| string| 验证码的base64编码内容，加上头，放入img标签即可显示|
+| picbas64 | string | 验证码的base64编码内容，加上头，放入img标签即可显示 |
 
 ### admin/do_web_write
 
@@ -67,9 +67,9 @@ method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明        |
+| 参数名 | 类型   | 说明       |
-| ------ | ------ | ----------- |
+| ------ | ------ | ---------- |
-| input     | string  | 输入的类容 |
+| input  | string | 输入的内容 |
 
 返回：
 
@@ -89,9 +89,28 @@ method: `POST`
 
 参数:
 
-| 参数名  |类型     | 说明       |
+| 参数名 | 类型 | 说明 |
-| ------ | ------ | -----------|
+| ------ | ---- | ---- |
-| 无     |   |  |
+| 无     |      |      |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/do_process_restart
+
+> 冷重启
+
+method: `POST`
+
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
 
 返回：
 
@@ -108,12 +127,12 @@ method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名       | 类型   | 说明                                  |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------------ | ------ | ------------------------------------- |
-| uin     | string | qq号 |
+| uin          | string | qq号                                  |
-| password     | string | qq密码 |
+| password     | string | qq密码                                |
-| enable_db     | string | 是否启动数据库,填 'true' 或者 'false' |
+| enable_db    | string | 是否启动数据库,填 'true' 或者 'false' |
-| access_token     | string | 授权 token |
+| access_token | string | 授权 token                            |
 
 返回：
 
@@ -130,14 +149,14 @@ method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名      | 类型   | 说明                                          |
-| ------ | ------ | ------------------------------------------------------------ |
+| ----------- | ------ | --------------------------------------------- |
-| port     | string | 服务端口 |
+| port        | string | 服务端口                                      |
-| host     | string | 服务监听地址 |
+| host        | string | 服务监听地址                                  |
-| enable     | string | 是否启用 ,填 'true' 或者 'false' |
+| enable      | string | 是否启用 ,填 'true' 或者 'false'              |
-| timeout     | string | http请求超时时间 |
+| timeout     | string | http请求超时时间                              |
-| post_url     | string | post上报地址 不需要就填空字符串，或者不填|
+| post_url    | string | post上报地址 不需要就填空字符串，或者不填     |
-| post_secret     | string | post上报的secret 不需要就填空字符串，或者不填 |
+| post_secret | string | post上报的secret 不需要就填空字符串，或者不填 |
 
 返回：
 
@@ -154,11 +173,11 @@ method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                             |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | -------------------------------- |
-| port     | string | 服务端口 |
+| port   | string | 服务端口                         |
-| host     | string | 服务监听地址 |
+| host   | string | 服务监听地址                     |
-| enable     | string | 是否启用 ,填 'true' 或者 'false' |
+| enable | string | 是否启用 ,填 'true' 或者 'false' |
 
 
 返回：
@@ -175,11 +194,11 @@ method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                             |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | -------------------------------- |
-| port     | string | 服务端口 |
+| port   | string | 服务端口                         |
-| host     | string | 服务监听地址 |
+| host   | string | 服务监听地址                     |
-| enable     | string | 是否启用 ,填 'true' 或者 'false' |
+| enable | string | 是否启用 ,填 'true' 或者 'false' |
 
 
 返回：
@@ -190,15 +209,15 @@ method: `POST` formdata
 
 ### admin/do_config_json
 
-> 直接修改 config.json配置
+> 直接修改 config.hjson配置
 
 method: `POST` formdata
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                                |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ----------------------------------- |
-| json     | string | 完整的config.json的配合，json字符串 |
+| json   | string | 完整的config.hjson的配合，json字符串 |
 
 
 返回：
@@ -209,15 +228,15 @@ method: `POST` formdata
 
 ### admin/get_config_json
 
-> 获取当前 config.json配置
+> 获取当前 config.hjson配置
 
 method: `GET`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型 | 说明 |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ---- | ---- |
-| 无     |  |  |
+| 无     |      |      |
 
 
 返回：
@@ -226,7 +245,7 @@ method: `GET`
 {"data": {"config":"xxxx"}, "retcode": 0, "status": "ok"}
 ```
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                                |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ----------------------------------- |
-| config     | string | 完整的config.json的配合，json字符串 |
+| config | string | 完整的config.hjson的配合，json字符串 |
 

docs/config.md

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

docs/file.md

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

docs/quick_start.md

@@ -28,8 +28,8 @@
 
 1.  双击`go-cqhttp.exe`此时将提示
 ```
-[WARNING]: 尝试加载配置文件 config.json 失败: 文件不存在
+[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
-[INFO]: 默认配置文件已生成,请编辑 config.json 后重启程序.
+[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
 ```
 2. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
 3. 再次双击`go-cqhttp.exe`
@@ -79,8 +79,8 @@ enable ws?(Y/n)
 2. `cd`到解压目录
 3. 输入 `./go-cqhttp`，`Enter`运行 ，此时将提示
 ```
-[WARNING]: 尝试加载配置文件 config.json 失败: 文件不存在
+[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
-[INFO]: 默认配置文件已生成,请编辑 config.json 后重启程序.
+[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
 ```
 
 4. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
@@ -103,8 +103,18 @@ enable ws?(Y/n)
 
 如果出现`{"data":{"message_id":balabala},"retcode":0,"status":"ok"}`则证明已经成功配置HTTP
 
+*注：请 连 中括号 也替换掉，就像这样：*`http://127.0.0.1:5700/send_private_msg?user_id=10001&message=ffeecoishp`
+
 # 进阶指南
 
+## 跳过启动的五秒延时
+
+使用命令行参数 `faststart`即可跳过启动的五秒钟延时，例如
+
+```
+.\go-cqhttp.exe faststart
+```
+
 ## 如何自己构建
 
 1. [下载源码](https://github.com/Mrs4s/go-cqhttp/archive/master.zip)并解压 || 使用`git clone https://github.com/Mrs4s/go-cqhttp.git`来拉取
@@ -117,13 +127,11 @@ enable ws?(Y/n)
 
 *注：可以使用*`go env -w GOPROXY=https://goproxy.cn,direct`*来加速国内依赖安装速度*
 
-*注：此时构建后的文件名为*`main`(Linux)或`main.exe`(Windows)
-
 ## 更新
 
 ### 方法一
 
-从[release] (https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
+从[release](https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
 并替换之前的版本
 
 ### 方法二
@@ -144,4 +152,4 @@ enable ws?(Y/n)
 - `https://github.rc1844.workers.dev`
 
 #### linux
-方法与windows基本一致，将 `go-cqhttp.exe` 替换为 `./go-cqhttp`即可
+方法与windows基本一致，将 `go-cqhttp.exe` 替换为 `./go-cqhttp`即可

docs/slider.md

@@ -0,0 +1,76 @@
+# 滑块验证码
+
+> 该文档已过期, 最新版本下可直接使用手机扫描二维码通过验证.
+
+由于TX最新的限制, 所有协议在陌生设备/IP登录时都有可能被要求通过滑块验证码, 否则将会出现 `当前上网环境异常` 的错误. 目前我们准备了两个临时方案应对该验证码.
+
+> 如果您有一台运行Windows的PC/Server 并且不会抓包操作, 我们建议直接使用方案B
+
+## 方案A: 自行抓包
+
+由于滑块验证码和QQ本体的协议独立, 我们无法直接处理并提交. 需要在浏览器通过后抓包并获取 `Ticket` 提交.
+
+该方案为具体的抓包教程, 如果您已经知道如何在浏览器中抓包. 可以略过接下来的文档并直接抓取 `cap_union_new_verify` 的返回值, 提取 `Ticket` 并在命令行提交.
+
+首先获取滑块验证码的地址, 并在浏览器中打开. 这里以 *Microsoft Edge* 浏览器为例, *Chrome* 同理. 
+
+![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
+
+首先选择 `1` 并提取链接在浏览器中打开
+
+![image.png](https://i.loli.net/2020/12/27/HYhmZv1wARMV7Uq.png)
+
+![image.png](https://i.loli.net/2020/12/27/otk9Hz7lBCaRFMV.png)
+
+此时不要滑动验证码, 首先按下 `F12` (键盘右上角退格键上方) 打开 *开发者工具*
+
+![image.png](https://i.loli.net/2020/12/27/JDioadLPwcKWpt1.png)
+
+点击 `Network` 选项卡 (在某些浏览器它可能叫做 `网络`)
+
+![image.png](https://i.loli.net/2020/12/27/qEzTB5jrDZUWSwp.png)
+
+点开 `Filter` (箭头) 按钮以确定您能看到下面的工具栏, 勾选 `Preserve log`(红框)
+
+此时可以滑动并通过验证码
+
+![image.png](https://i.loli.net/2020/12/27/Id4hxzyDprQuF2G.png)
+
+回到 *开发者工具*, 我们可以看到已经有了一个请求.
+
+![image.png](https://i.loli.net/2020/12/27/3C6Y2XVKBRv1z9E.png)
+
+此时如果有多个请求, 请不要慌张. 看到上面的 `Filter` 没? 此时在 `Filter` 输入框中输入 `cap_union_new`, 就应该只剩一个请求了.
+
+然后点击该请求. 点开 `Preview` 选项卡 (箭头):  
+
+![image.png](https://i.loli.net/2020/12/27/P1VtxRWpjY8524Z.png)
+
+此时就能看到一个标准的 `JSON`, 复制 `ticket` 字段并回到 `go-cqhttp` 粘贴. 即可通过滑块验证.
+
+如果您看到这里还是不会如何操作, 没关系! 我们还准备了方案B.
+
+## 方案B: 使用专用工具
+
+此方案需要您有一台可以操作的 `Windows` 电脑.
+
+首先下载工具:  [蓝奏云](https://wws.lanzous.com/i2vn0jrofte) [Google Drive](https://drive.google.com/file/d/1peMDHqgP8AgWBVp5vP-cfhcGrb2ksSrE/view?usp=sharing)
+
+解压并打开工具: 
+
+![image.png](https://i.loli.net/2020/12/27/winG4SkxhgLoNDZ.png)
+
+打开 `go-cqhttp` 并选择 `2`:
+
+![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
+
+复制 `ID` 并前往工具粘贴:
+
+![image.png](https://i.loli.net/2020/12/27/fIwXx5nN9r8Zbc7.png)
+
+![image.png](https://i.loli.net/2020/12/27/WZsTCyGwSjc9mb5.png)
+
+点击 `OK` 并处理滑块, 完成即可登录成功. (OK可能反应稍微慢点, 请不要多次点击)
+
+![image.png](https://i.loli.net/2020/12/27/UnvAuxreijYzgLC.png)
+

global/all_test.go

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

global/buffer.go

@@ -0,0 +1,27 @@
+package global
+
+import (
+	"bytes"
+	"sync"
+)
+
+var bufferPool = sync.Pool{
+	New: func() interface{} {
+		return new(bytes.Buffer)
+	},
+}
+
+// NewBuffer 从池中获取新 bytes.Buffer
+func NewBuffer() *bytes.Buffer {
+	return bufferPool.Get().(*bytes.Buffer)
+}
+
+// PutBuffer 将 Buffer放入池中
+func PutBuffer(buf *bytes.Buffer) {
+	// See https://golang.org/issue/23199
+	const maxSize = 1 << 16
+	if buf != nil && buf.Cap() < maxSize { // 对于大Buffer直接丢弃
+		buf.Reset()
+		bufferPool.Put(buf)
+	}
+}

global/codec.go

@@ -2,43 +2,47 @@ package global
 
 import (
 	"crypto/md5"
-	"errors"
+	"encoding/hex"
-	"fmt"
+	"os"
-	log "github.com/sirupsen/logrus"
+	"os/exec"
-	"github.com/wdvxdr1123/go-silk/silk"
-	"io/ioutil"
 	"path"
-	"sync"
+
+	"github.com/pkg/errors"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 )
 
-var codec silk.Encoder
+// EncoderSilk 将音频编码为Silk
-var useCodec = true
+func EncoderSilk(data []byte) ([]byte, error) {
-var once sync.Once
-
-func InitCodec() {
-	once.Do(func() {
-		log.Info("正在加载silk编码器...")
-		err := codec.Init("data/cache", "codec")
-		if err != nil {
-			log.Error(err)
-			useCodec = false
-		}
-	})
-}
-
-func Encoder(data []byte) ([]byte, error) {
-	if useCodec == false {
-		return nil, errors.New("no silk encoder")
-	}
 	h := md5.New()
-	h.Write(data)
+	_, err := h.Write(data)
-	tempName := fmt.Sprintf("%x", h.Sum(nil))
-	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
-		return ioutil.ReadFile(silkPath)
-	}
-	slk, err := codec.EncodeToSilk(data, tempName, true)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "calc md5 failed")
+	}
+	tempName := hex.EncodeToString(h.Sum(nil))
+	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
+		return os.ReadFile(silkPath)
+	}
+	slk, err := base.EncodeSilk(data, tempName)
+	if err != nil {
+		return nil, errors.Wrap(err, "encode silk failed")
 	}
 	return slk, nil
 }
+
+// EncodeMP4 将给定视频文件编码为MP4
+func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
+	cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
+	err := cmd1.Run()
+	if err != nil {
+		cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst)
+		return errors.Wrap(cmd2.Run(), "convert mp4 failed")
+	}
+	return err
+}
+
+// ExtractCover 获取给定视频文件的Cover
+func ExtractCover(src string, target string) error {
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
+	return errors.Wrap(cmd.Run(), "extract video cover failed")
+}

global/config.go

@@ -1,165 +0,0 @@
-package global
-
-import (
-	"encoding/json"
-	"os"
-	"strconv"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-)
-
-type JsonConfig struct {
-	Uin               int64  `json:"uin"`
-	Password          string `json:"password"`
-	EncryptPassword   bool   `json:"encrypt_password"`
-	PasswordEncrypted string `json:"password_encrypted"`
-	EnableDB          bool   `json:"enable_db"`
-	AccessToken       string `json:"access_token"`
-	ReLogin           struct {
-		Enabled         bool `json:"enabled"`
-		ReLoginDelay    int  `json:"relogin_delay"`
-		MaxReloginTimes uint `json:"max_relogin_times"`
-	} `json:"relogin"`
-	RateLimit struct {
-		Enabled    bool    `json:"enabled"`
-		Frequency  float64 `json:"frequency"`
-		BucketSize int     `json:"bucket_size"`
-	} `json:"_rate_limit"`
-	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
-	ForceFragmented     bool                          `json:"force_fragmented"`
-	HeartbeatInterval   time.Duration                 `json:"heartbeat_interval"`
-	HttpConfig          *GoCQHttpConfig               `json:"http_config"`
-	WSConfig            *GoCQWebsocketConfig          `json:"ws_config"`
-	ReverseServers      []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
-	PostMessageFormat   string                        `json:"post_message_format"`
-	UseSSOAddress       bool                          `json:"use_sso_address"`
-	Debug               bool                          `json:"debug"`
-	LogLevel            string                        `json:"log_level"`
-	WebUi               *GoCqWebUi                    `json:"web_ui"`
-}
-
-type CQHttpApiConfig struct {
-	Host                         string `json:"host"`
-	Port                         uint16 `json:"port"`
-	UseHttp                      bool   `json:"use_http"`
-	WSHost                       string `json:"ws_host"`
-	WSPort                       uint16 `json:"ws_port"`
-	UseWS                        bool   `json:"use_ws"`
-	WSReverseUrl                 string `json:"ws_reverse_url"`
-	WSReverseApiUrl              string `json:"ws_reverse_api_url"`
-	WSReverseEventUrl            string `json:"ws_reverse_event_url"`
-	WSReverseReconnectInterval   uint16 `json:"ws_reverse_reconnect_interval"`
-	WSReverseReconnectOnCode1000 bool   `json:"ws_reverse_reconnect_on_code_1000"`
-	UseWsReverse                 bool   `json:"use_ws_reverse"`
-	PostUrl                      string `json:"post_url"`
-	AccessToken                  string `json:"access_token"`
-	Secret                       string `json:"secret"`
-	PostMessageFormat            string `json:"post_message_format"`
-}
-
-type GoCQHttpConfig struct {
-	Enabled  bool              `json:"enabled"`
-	Host     string            `json:"host"`
-	Port     uint16            `json:"port"`
-	Timeout  int32             `json:"timeout"`
-	PostUrls map[string]string `json:"post_urls"`
-}
-
-type GoCQWebsocketConfig struct {
-	Enabled bool   `json:"enabled"`
-	Host    string `json:"host"`
-	Port    uint16 `json:"port"`
-}
-
-type GoCQReverseWebsocketConfig struct {
-	Enabled                  bool   `json:"enabled"`
-	ReverseUrl               string `json:"reverse_url"`
-	ReverseApiUrl            string `json:"reverse_api_url"`
-	ReverseEventUrl          string `json:"reverse_event_url"`
-	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
-}
-
-type GoCqWebUi struct {
-	Enabled   bool   `json:"enabled"`
-	Host      string `json:"host"`
-	WebUiPort uint64 `json:"web_ui_port"`
-	WebInput  bool   `json:"web_input"`
-}
-
-func DefaultConfig() *JsonConfig {
-	return &JsonConfig{
-		EnableDB: true,
-		ReLogin: struct {
-			Enabled         bool `json:"enabled"`
-			ReLoginDelay    int  `json:"relogin_delay"`
-			MaxReloginTimes uint `json:"max_relogin_times"`
-		}{
-			Enabled:         true,
-			ReLoginDelay:    3,
-			MaxReloginTimes: 0,
-		},
-		RateLimit: struct {
-			Enabled    bool    `json:"enabled"`
-			Frequency  float64 `json:"frequency"`
-			BucketSize int     `json:"bucket_size"`
-		}{
-			Enabled:    false,
-			Frequency:  1,
-			BucketSize: 1,
-		},
-		PostMessageFormat: "string",
-		ForceFragmented:   false,
-		HttpConfig: &GoCQHttpConfig{
-			Enabled:  true,
-			Host:     "0.0.0.0",
-			Port:     5700,
-			PostUrls: map[string]string{},
-		},
-		WSConfig: &GoCQWebsocketConfig{
-			Enabled: true,
-			Host:    "0.0.0.0",
-			Port:    6700,
-		},
-		ReverseServers: []*GoCQReverseWebsocketConfig{
-			{
-				Enabled:                  false,
-				ReverseUrl:               "ws://you_websocket_universal.server",
-				ReverseApiUrl:            "ws://you_websocket_api.server",
-				ReverseEventUrl:          "ws://you_websocket_event.server",
-				ReverseReconnectInterval: 3000,
-			},
-		},
-		WebUi: &GoCqWebUi{
-			Enabled:   true,
-			Host:      "127.0.0.1",
-			WebInput:  false,
-			WebUiPort: 9999,
-		},
-	}
-}
-
-func Load(p string) *JsonConfig {
-	if !PathExists(p) {
-		log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
-		return nil
-	}
-	c := JsonConfig{}
-	err := json.Unmarshal([]byte(ReadAllText(p)), &c)
-	if err != nil {
-		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
-		log.Infoln("原文件已备份")
-		os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
-		return nil
-	}
-	return &c
-}
-
-func (c *JsonConfig) Save(p string) error {
-	data, err := json.MarshalIndent(c, "", "\t")
-	if err != nil {
-		return err
-	}
-	WriteAllText(p, string(data))
-	return nil
-}

global/doc.go

@@ -0,0 +1,2 @@
+// Package global 包含文件下载,视频音频编码,本地文件缓存处理,消息过滤器,调用速率限制,gocq主配置等的相关函数与结构体
+package global

global/filter.go

@@ -1,78 +1,80 @@
 package global
 
 import (
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	"io/ioutil"
 	"regexp"
 	"strings"
+
+	"github.com/tidwall/gjson"
 )
 
+// Filter 定义了一个消息上报过滤接口
 type Filter interface {
 	Eval(payload gjson.Result) bool
 }
 
-type OperationNode struct {
+type operationNode struct {
 	key    string
 	filter Filter
 }
 
-type NotOperator struct {
+// notOperator 定义了过滤器中Not操作符
-	operand_ Filter
+type notOperator struct {
+	operand Filter
 }
 
-func notOperatorConstruct(argument gjson.Result) *NotOperator {
+func newNotOp(argument gjson.Result) Filter {
 	if !argument.IsObject() {
 		panic("the argument of 'not' operator must be an object")
 	}
-	op := new(NotOperator)
+	return &notOperator{operand: Generate("and", argument)}
-	op.operand_ = Generate("and", argument)
-	return op
 }
 
-func (notOperator NotOperator) Eval(payload gjson.Result) bool {
+// Eval 对payload执行Not过滤
-	return !(notOperator.operand_).Eval(payload)
+func (op *notOperator) Eval(payload gjson.Result) bool {
+	return !op.operand.Eval(payload)
 }
 
-type AndOperator struct {
+// andOperator 定义了过滤器中And操作符
-	operands []OperationNode
+type andOperator struct {
+	operands []operationNode
 }
 
-func andOperatorConstruct(argument gjson.Result) *AndOperator {
+func newAndOp(argument gjson.Result) Filter {
 	if !argument.IsObject() {
 		panic("the argument of 'and' operator must be an object")
 	}
-	op := new(AndOperator)
+	op := new(andOperator)
 	argument.ForEach(func(key, value gjson.Result) bool {
-		if key.Str[0] == '.' {
+		switch {
+		case key.Str[0] == '.':
 			// is an operator
 			//   ".foo": {
 			//       "bar": "baz"
 			//   }
 			opKey := key.Str[1:]
-			op.operands = append(op.operands, OperationNode{"", Generate(opKey, value)})
+			op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
-		} else if value.IsObject() {
+		case value.IsObject():
 			// is an normal key with an object as the value
 			//   "foo": {
 			//       ".bar": "baz"
 			//   }
 			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, Generate("and", value)})
+			op.operands = append(op.operands, operationNode{opKey, Generate("and", value)})
-		} else {
+		default:
 			// is an normal key with a non-object as the value
 			//   "foo": "bar"
 			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, Generate("eq", value)})
+			op.operands = append(op.operands, operationNode{opKey, Generate("eq", value)})
 		}
 		return true
 	})
 	return op
 }
 
-func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
+// Eval 对payload执行And过滤
+func (op *andOperator) Eval(payload gjson.Result) bool {
 	res := true
-	for _, operand := range andOperator.operands {
+	for _, operand := range op.operands {
-
 		if len(operand.key) == 0 {
 			// is an operator
 			res = res && operand.filter.Eval(payload)
@@ -82,22 +84,23 @@ func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
 			res = res && operand.filter.Eval(val)
 		}
 
-		if res == false {
+		if !res {
 			break
 		}
 	}
 	return res
 }
 
-type OrOperator struct {
+// orOperator 定义了过滤器中Or操作符
+type orOperator struct {
 	operands []Filter
 }
 
-func orOperatorConstruct(argument gjson.Result) *OrOperator {
+func newOrOp(argument gjson.Result) Filter {
 	if !argument.IsArray() {
 		panic("the argument of 'or' operator must be an array")
 	}
-	op := new(OrOperator)
+	op := new(orOperator)
 	argument.ForEach(func(_, value gjson.Result) bool {
 		op.operands = append(op.operands, Generate("and", value))
 		return true
@@ -105,147 +108,137 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
 	return op
 }
 
-func (orOperator OrOperator) Eval(payload gjson.Result) bool {
+// Eval 对payload执行Or过滤
+func (op *orOperator) Eval(payload gjson.Result) bool {
 	res := false
-	for _, operand := range orOperator.operands {
+	for _, operand := range op.operands {
 		res = res || operand.Eval(payload)
-
+		if res {
-		if res == true {
 			break
 		}
 	}
 	return res
 }
 
-type EqualOperator struct {
+// eqOperator 定义了过滤器中Equal操作符
-	value gjson.Result
+type eqOperator struct {
-}
-
-func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
-	op := new(EqualOperator)
-	op.value = argument
-	return op
-}
-
-func (equalOperator EqualOperator) Eval(payload gjson.Result) bool {
-	return payload.String() == equalOperator.value.String()
-}
-
-type NotEqualOperator struct {
-	value gjson.Result
-}
-
-func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
-	op := new(NotEqualOperator)
-	op.value = argument
-	return op
-}
-
-func (notEqualOperator NotEqualOperator) Eval(payload gjson.Result) bool {
-	return !(payload.String() == notEqualOperator.value.String())
-}
-
-type InOperator struct {
-	operand gjson.Result
-}
-
-func inOperatorConstruct(argument gjson.Result) *InOperator {
-	if argument.IsObject() {
-		panic("the argument of 'in' operator must be an array or a string")
-	}
-	op := new(InOperator)
-	op.operand = argument
-	return op
-}
-
-func (inOperator InOperator) Eval(payload gjson.Result) bool {
-	if inOperator.operand.IsArray() {
-		res := false
-		inOperator.operand.ForEach(func(key, value gjson.Result) bool {
-			res = res || value.String() == payload.String()
-			return true
-		})
-		return res
-	}
-	return strings.Contains(inOperator.operand.String(), payload.String())
-}
-
-type ContainsOperator struct {
 	operand string
 }
 
-func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
+func newEqOp(argument gjson.Result) Filter {
+	return &eqOperator{operand: argument.String()}
+}
+
+// Eval 对payload执行Equal过滤
+func (op *eqOperator) Eval(payload gjson.Result) bool {
+	return payload.String() == op.operand
+}
+
+// neqOperator 定义了过滤器中NotEqual操作符
+type neqOperator struct {
+	operand string
+}
+
+func newNeqOp(argument gjson.Result) Filter {
+	return &neqOperator{operand: argument.String()}
+}
+
+// Eval 对payload执行NotEqual过滤
+func (op *neqOperator) Eval(payload gjson.Result) bool {
+	return !(payload.String() == op.operand)
+}
+
+// inOperator 定义了过滤器中In操作符
+type inOperator struct {
+	operandString string
+	operandArray  []string
+}
+
+func newInOp(argument gjson.Result) Filter {
+	if argument.IsObject() {
+		panic("the argument of 'in' operator must be an array or a string")
+	}
+	op := new(inOperator)
+	if argument.IsArray() {
+		op.operandArray = []string{}
+		argument.ForEach(func(_, value gjson.Result) bool {
+			op.operandArray = append(op.operandArray, value.String())
+			return true
+		})
+	} else {
+		op.operandString = argument.String()
+	}
+	return op
+}
+
+// Eval 对payload执行In过滤
+func (op *inOperator) Eval(payload gjson.Result) bool {
+	payloadStr := payload.String()
+	if op.operandArray != nil {
+		for _, value := range op.operandArray {
+			if value == payloadStr {
+				return true
+			}
+		}
+		return false
+	}
+	return strings.Contains(op.operandString, payloadStr)
+}
+
+// containsOperator 定义了过滤器中Contains操作符
+type containsOperator struct {
+	operand string
+}
+
+func newContainOp(argument gjson.Result) Filter {
 	if argument.IsArray() || argument.IsObject() {
 		panic("the argument of 'contains' operator must be a string")
 	}
-	op := new(ContainsOperator)
+	return &containsOperator{operand: argument.String()}
-	op.operand = argument.String()
-	return op
 }
 
-func (containsOperator ContainsOperator) Eval(payload gjson.Result) bool {
+// Eval 对payload执行Contains过滤
-	if payload.IsObject() || payload.IsArray() {
+func (op *containsOperator) Eval(payload gjson.Result) bool {
-		return false
+	return strings.Contains(payload.String(), op.operand)
-	}
-	return strings.Contains(payload.String(), containsOperator.operand)
 }
 
-type RegexOperator struct {
+// regexOperator 定义了过滤器中Regex操作符
-	regex string
+type regexOperator struct {
+	regex *regexp.Regexp
 }
 
-func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
+func newRegexOp(argument gjson.Result) Filter {
 	if argument.IsArray() || argument.IsObject() {
 		panic("the argument of 'regex' operator must be a string")
 	}
-	op := new(RegexOperator)
+	return &regexOperator{regex: regexp.MustCompile(argument.String())}
-	op.regex = argument.String()
-	return op
 }
 
-func (containsOperator RegexOperator) Eval(payload gjson.Result) bool {
+// Eval 对payload执行RegexO过滤
-	matched, _ := regexp.MatchString(containsOperator.regex, payload.String())
+func (op *regexOperator) Eval(payload gjson.Result) bool {
-	return matched
+	return op.regex.MatchString(payload.String())
 }
 
+// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
 func Generate(opName string, argument gjson.Result) Filter {
 	switch opName {
 	case "not":
-		return notOperatorConstruct(argument)
+		return newNotOp(argument)
 	case "and":
-		return andOperatorConstruct(argument)
+		return newAndOp(argument)
 	case "or":
-		return orOperatorConstruct(argument)
+		return newOrOp(argument)
-	case "neq":
-		return notEqualOperatorConstruct(argument)
 	case "eq":
-		return equalOperatorConstruct(argument)
+		return newEqOp(argument)
+	case "neq":
+		return newNeqOp(argument)
 	case "in":
-		return inOperatorConstruct(argument)
+		return newInOp(argument)
 	case "contains":
-		return containsOperatorConstruct(argument)
+		return newContainOp(argument)
 	case "regex":
-		return regexOperatorConstruct(argument)
+		return newRegexOp(argument)
 	default:
 		panic("the operator " + opName + " is not supported")
 	}
 }
-
-var EventFilter = new(Filter)
-
-func BootFilter() {
-	defer func() {
-		if e := recover(); e != nil {
-			log.Warnf("事件过滤器启动失败: %v", e)
-			EventFilter = nil
-		} else {
-			log.Info("事件过滤器启动成功.")
-		}
-	}()
-	f, err := ioutil.ReadFile("filter.json")
-	if err != nil {
-		panic(err)
-	} else {
-		*EventFilter = Generate("and", gjson.ParseBytes(f))
-	}
-}

global/fs.go

@@ -3,13 +3,8 @@ package global
 import (
 	"bytes"
 	"crypto/md5"
-	"encoding/base64"
 	"encoding/hex"
 	"errors"
-	"fmt"
-	"github.com/dustin/go-humanize"
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
 	"net"
 	"net/url"
 	"os"
@@ -17,81 +12,112 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+
+	"github.com/Mrs4s/MiraiGo/utils"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/internal/param"
+)
+
+const (
+	// ImagePath go-cqhttp使用的图片缓存目录
+	ImagePath = "data/images"
+	// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
+	ImagePathOld = "data/image"
+	// VoicePath go-cqhttp使用的语音缓存目录
+	VoicePath = "data/voices"
+	// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
+	VoicePathOld = "data/record"
+	// VideoPath go-cqhttp使用的视频缓存目录
+	VideoPath = "data/videos"
+	// CachePath go-cqhttp使用的缓存目录
+	CachePath = "data/cache"
 )
 
 var (
-	IMAGE_PATH = path.Join("data", "images")
+	// ErrSyntax Path语法错误时返回的错误
-	VOICE_PATH = path.Join("data", "voices")
+	ErrSyntax = errors.New("syntax error")
-	VIDEO_PATH = path.Join("data", "videos")
+	// HeaderAmr AMR文件头
-	CACHE_PATH = path.Join("data", "cache")
+	HeaderAmr = []byte("#!AMR")
-
+	// HeaderSilk Silkv3文件头
-	HEADER_AMR  = []byte("#!AMR")
+	HeaderSilk = []byte("\x02#!SILK_V3")
-	HEADER_SILK = []byte("\x02#!SILK_V3")
 )
 
+// PathExists 判断给定path是否存在
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
-	return err == nil || os.IsExist(err)
+	return err == nil || errors.Is(err, os.ErrExist)
 }
 
+// ReadAllText 读取给定path对应文件，无法读取时返回空值
 func ReadAllText(path string) string {
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
+		log.Error(err)
 		return ""
 	}
 	return string(b)
 }
 
-func WriteAllText(path, text string) {
+// WriteAllText 将给定text写入给定path
-	_ = ioutil.WriteFile(path, []byte(text), 0644)
+func WriteAllText(path, text string) error {
+	return os.WriteFile(path, utils.S2B(text), 0o644)
 }
 
-func Check(err error) {
+// Check 检测err是否为nil
+func Check(err error, deleteSession bool) {
 	if err != nil {
+		if deleteSession && PathExists("session.token") {
+			_ = os.Remove("session.token")
+		}
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
 
+// IsAMRorSILK 判断给定文件是否为Amr或Silk格式
 func IsAMRorSILK(b []byte) bool {
-	return bytes.HasPrefix(b, HEADER_AMR) || bytes.HasPrefix(b, HEADER_SILK)
+	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
 }
 
-func FindFile(f, cache, PATH string) (data []byte, err error) {
+// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
-	data, err = nil, errors.New("syntax error")
+// 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
-	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
+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(f))
+		hash := md5.Sum([]byte(file))
-		cacheFile := path.Join(CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
 		if PathExists(cacheFile) && cache == "1" {
-			return ioutil.ReadFile(cacheFile)
+			return os.ReadFile(cacheFile)
 		}
-		data, err = GetBytes(f)
+		data, err = GetBytes(file)
-		_ = ioutil.WriteFile(cacheFile, data, 0644)
+		_ = os.WriteFile(cacheFile, data, 0o644)
 		if err != nil {
 			return nil, err
 		}
-	} else if strings.HasPrefix(f, "base64") {
+	case strings.HasPrefix(file, "base64"):
-		data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
+		data, err = param.Base64DecodeString(strings.TrimPrefix(file, "base64://"))
 		if err != nil {
 			return nil, err
 		}
-	} else if strings.HasPrefix(f, "file") {
+	case strings.HasPrefix(file, "file"):
 		var fu *url.URL
-		fu, err = url.Parse(f)
+		fu, err = url.Parse(file)
 		if err != nil {
 			return nil, err
 		}
 		if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
 			fu.Path = fu.Path[1:]
 		}
-		data, err = ioutil.ReadFile(fu.Path)
+		data, err = os.ReadFile(fu.Path)
 		if err != nil {
 			return nil, err
 		}
-	} else if PathExists(path.Join(PATH, f)) {
+	case PathExists(path.Join(p, file)):
-		data, err = ioutil.ReadFile(path.Join(PATH, f))
+		data, err = os.ReadFile(path.Join(p, file))
 		if err != nil {
 			return nil, err
 		}
@@ -99,21 +125,22 @@ func FindFile(f, cache, PATH string) (data []byte, err error) {
 	return
 }
 
+// DelFile 删除一个给定path，并返回删除结果
 func DelFile(path string) bool {
 	err := os.Remove(path)
 	if err != nil {
 		// 删除失败
 		log.Error(err)
 		return false
-	} else {
-		// 删除成功
-		log.Info(path + "删除成功")
-		return true
 	}
+	// 删除成功
+	log.Info(path + "删除成功")
+	return true
 }
 
+// ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
 func ReadAddrFile(path string) []*net.TCPAddr {
-	d, err := ioutil.ReadFile(path)
+	d, err := os.ReadFile(path)
 	if err != nil {
 		return nil
 	}
@@ -129,19 +156,3 @@ func ReadAddrFile(path string) []*net.TCPAddr {
 	}
 	return ret
 }
-
-type WriteCounter struct {
-	Total uint64
-}
-
-func (wc *WriteCounter) Write(p []byte) (int, error) {
-	n := len(p)
-	wc.Total += uint64(n)
-	wc.PrintProgress()
-	return n, nil
-}
-
-func (wc WriteCounter) PrintProgress() {
-	fmt.Printf("\r%s", strings.Repeat(" ", 35))
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
-}

global/log_hook.go

@@ -0,0 +1,195 @@
+package global
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"sync"
+
+	"github.com/sirupsen/logrus"
+)
+
+// LocalHook logrus本地钩子
+type LocalHook struct {
+	lock      *sync.Mutex
+	levels    []logrus.Level   // hook级别
+	formatter logrus.Formatter // 格式
+	path      string           // 写入path
+	writer    io.Writer        // io
+}
+
+// Levels ref: logrus/hooks.go impl Hook interface
+func (hook *LocalHook) Levels() []logrus.Level {
+	if len(hook.levels) == 0 {
+		return logrus.AllLevels
+	}
+	return hook.levels
+}
+
+func (hook *LocalHook) ioWrite(entry *logrus.Entry) error {
+	log, err := hook.formatter.Format(entry)
+	if err != nil {
+		return err
+	}
+
+	_, err = hook.writer.Write(log)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
+	dir := filepath.Dir(hook.path)
+	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+		return err
+	}
+
+	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o666)
+	if err != nil {
+		return err
+	}
+	defer fd.Close()
+
+	log, err := hook.formatter.Format(entry)
+	if err != nil {
+		return err
+	}
+
+	_, err = fd.Write(log)
+	return err
+}
+
+// Fire ref: logrus/hooks.go impl Hook interface
+func (hook *LocalHook) Fire(entry *logrus.Entry) error {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+
+	if hook.writer != nil {
+		return hook.ioWrite(entry)
+	}
+
+	if hook.path != "" {
+		return hook.pathWrite(entry)
+	}
+
+	return nil
+}
+
+// SetFormatter 设置日志格式
+func (hook *LocalHook) SetFormatter(formatter 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
+}
+
+// SetWriter 设置Writer
+func (hook *LocalHook) SetWriter(writer io.Writer) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+	hook.writer = writer
+}
+
+// SetPath 设置日志写入路径
+func (hook *LocalHook) SetPath(path string) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+	hook.path = path
+}
+
+// NewLocalHook 初始化本地日志钩子实现
+func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
+	hook := &LocalHook{
+		lock: new(sync.Mutex),
+	}
+	hook.SetFormatter(formatter)
+	hook.levels = append(hook.levels, levels...)
+
+	switch arg := args.(type) {
+	case string:
+		hook.SetPath(arg)
+	case io.Writer:
+		hook.SetWriter(arg)
+	default:
+		panic(fmt.Sprintf("unsupported type: %v", reflect.TypeOf(args)))
+	}
+
+	return hook
+}
+
+// GetLogLevel 获取日志等级
+//
+// 可能的值有
+//
+// "trace","debug","info","warn","warn","error"
+func GetLogLevel(level string) []logrus.Level {
+	switch level {
+	case "trace":
+		return []logrus.Level{
+			logrus.TraceLevel, logrus.DebugLevel,
+			logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
+	case "debug":
+		return []logrus.Level{
+			logrus.DebugLevel, logrus.InfoLevel,
+			logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
+	case "info":
+		return []logrus.Level{
+			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
+		}
+	case "warn":
+		return []logrus.Level{
+			logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
+	case "error":
+		return []logrus.Level{
+			logrus.ErrorLevel, logrus.FatalLevel,
+			logrus.PanicLevel,
+		}
+	default:
+		return []logrus.Level{
+			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
+		}
+	}
+}
+
+// LogFormat specialize for go-cqhttp
+type LogFormat struct{}
+
+// Format implements logrus.Formatter
+func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
+	buf := NewBuffer()
+	defer PutBuffer(buf)
+	buf.WriteByte('[')
+	buf.WriteString(entry.Time.Format("2006-01-02 15:04:05"))
+	buf.WriteString("] [")
+	buf.WriteString(strings.ToUpper(entry.Level.String()))
+	buf.WriteString("]: ")
+	buf.WriteString(entry.Message)
+	buf.WriteString(" \n")
+	ret := append([]byte(nil), buf.Bytes()...) // copy buffer
+	return ret, nil
+}

global/net.go

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

global/param.go

@@ -1,72 +1,46 @@
 package global
 
 import (
-	"github.com/tidwall/gjson"
-	"math"
 	"regexp"
 	"strconv"
-	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
-var trueSet = map[string]struct{}{
+// MSG 消息Map
-	"true": {},
+type MSG map[string]interface{}
-	"yes":  {},
-	"1":    {},
-}
-
-var falseSet = map[string]struct{}{
-	"false": {},
-	"no":    {},
-	"0":     {},
-}
-
-func EnsureBool(p interface{}, defaultVal bool) bool {
-	var str string
-	if b, ok := p.(bool); ok {
-		return b
-	}
-	if j, ok := p.(gjson.Result); ok {
-		if !j.Exists() {
-			return defaultVal
-		}
-		if j.Type == gjson.True {
-			return true
-		}
-		if j.Type == gjson.False {
-			return false
-		}
-		if j.Type != gjson.String {
-			return defaultVal
-		}
-		str = j.Str
-	} else if s, ok := p.(string); ok {
-		str = s
-	}
-	str = strings.ToLower(str)
-	if _, ok := trueSet[str]; ok {
-		return true
-	}
-	if _, ok := falseSet[str]; ok {
-		return false
-	}
-	return defaultVal
-}
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
+//
 // 例: v0.9.29-fix2 == v0.9.29-fix2 -> false
+//
 // v0.9.29-fix1 < v0.9.29-fix2 -> true
+//
 // v0.9.29-fix2 > v0.9.29-fix1 -> false
+//
 // v0.9.29-fix2 < v0.9.30 -> true
+//
+// v1.0.0-alpha2 < v1.0.0-beta1 -> true
+//
+// v1.0.0 > v1.0.0-beta1 -> false
 func VersionNameCompare(current, remote string) bool {
-	sp := regexp.MustCompile(`[0-9]\d*`)
+	defer func() { // 应该不会panic， 为了保险还是加个
-	cur := sp.FindAllStringSubmatch(current, -1)
+		if err := recover(); err != nil {
-	re := sp.FindAllStringSubmatch(remote, -1)
+			log.Warn("检查更新失败！")
-	for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
+		}
-		curSub, _ := strconv.Atoi(cur[i][0])
+	}()
-		reSub, _ := strconv.Atoi(re[i][0])
+	sp := regexp.MustCompile(`v(\d+)\.(\d+)\.(\d+)-?(.+)?`)
-		if curSub < reSub {
+	cur := sp.FindStringSubmatch(current)
-			return true
+	re := sp.FindStringSubmatch(remote)
+	for i := 1; i <= 3; i++ {
+		curSub, _ := strconv.Atoi(cur[i])
+		reSub, _ := strconv.Atoi(re[i])
+		if curSub != reSub {
+			return curSub < reSub
 		}
 	}
-	return len(cur) < len(re)
+	if cur[4] == "" || re[4] == "" {
+		return re[4] == "" && cur[4] != re[4]
+	}
+	return cur[4] < re[4]
 }

global/ratelimit.go

@@ -1,20 +0,0 @@
-package global
-
-import (
-	"context"
-	"golang.org/x/time/rate"
-)
-
-var limiter *rate.Limiter
-var limitEnable = false
-
-func RateLimit(ctx context.Context) {
-	if limitEnable {
-		_ = limiter.Wait(ctx)
-	}
-}
-
-func InitLimiter(r float64, b int) {
-	limitEnable = true
-	limiter = rate.NewLimiter(rate.Limit(r), b)
-}

global/signal.go

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

global/signal_unix.go

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

global/signal_windows.go

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

global/terminal/doc.go

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

global/terminal/double_click.go

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

global/terminal/double_click_windows.go

@@ -0,0 +1,67 @@
+//go:build windows
+// +build windows
+
+package terminal
+
+import (
+	"os"
+	"syscall"
+	"unsafe"
+
+	"github.com/pkg/errors"
+)
+
+// RunningByDoubleClick 检查是否通过双击直接运行
+func RunningByDoubleClick() bool {
+	kernel32 := syscall.NewLazyDLL("kernel32.dll")
+	lp := kernel32.NewProc("GetConsoleProcessList")
+	if lp != nil {
+		var ids [2]uint32
+		var maxCount uint32 = 2
+		ret, _, _ := lp.Call(uintptr(unsafe.Pointer(&ids)), uintptr(maxCount))
+		if ret > 1 {
+			return false
+		}
+	}
+	return true
+}
+
+// NoMoreDoubleClick 提示用户不要双击运行，并生成安全启动脚本
+func NoMoreDoubleClick() error {
+	r := boxW(0, "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
+	if r == 2 {
+		return nil
+	}
+	r = boxW(0, "点击确认将覆盖go-cqhttp.bat，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
+	if r == 2 {
+		return nil
+	}
+	f, err := os.OpenFile("go-cqhttp.bat", os.O_CREATE|os.O_RDWR, 0o666)
+	if err != nil {
+		return err
+	}
+	if err != nil {
+		return errors.Errorf("打开go-cqhttp.bat失败: %v", err)
+	}
+	_ = f.Truncate(0)
+	_, err = f.WriteString("%Created by go-cqhttp. DO NOT EDIT ME!%\nstart cmd /K go-cqhttp.exe")
+	if err != nil {
+		return errors.Errorf("写入go-cqhttp.bat失败: %v", err)
+	}
+	f.Close()
+	boxW(0, "安全启动脚本已生成，请双击go-cqhttp.bat启动", "提示", 0x00000040|0x00000000)
+	return nil
+}
+
+// BoxW of Win32 API. Check https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-messageboxw for more detail.
+func boxW(hwnd uintptr, caption, title string, flags uint) int {
+	captionPtr, _ := syscall.UTF16PtrFromString(caption)
+	titlePtr, _ := syscall.UTF16PtrFromString(title)
+	ret, _, _ := syscall.NewLazyDLL("user32.dll").NewProc("MessageBoxW").Call(
+		hwnd,
+		uintptr(unsafe.Pointer(captionPtr)),
+		uintptr(unsafe.Pointer(titlePtr)),
+		uintptr(flags))
+
+	return int(ret)
+}

go.mod

@@ -1,26 +1,56 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.14
+go 1.17
+
+replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20201114110437-3d349df7362e
+	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
+	github.com/Microsoft/go-winio v0.5.0
+	github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82
 	github.com/dustin/go-humanize v1.0.0
-	github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c
+	github.com/fumiama/go-hide-param v0.1.4
-	github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1
-	github.com/gin-gonic/gin v1.6.3
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.3
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
-	github.com/kr/binarydist v0.1.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.3 // indirect
+	github.com/pkg/errors v0.9.1
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/segmentio/asm v1.0.0
-	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
+	github.com/sirupsen/logrus v1.8.1
-	github.com/sirupsen/logrus v1.7.0
+	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
+	github.com/tidwall/gjson v1.8.1
-	github.com/tidwall/gjson v1.6.3
+	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
-	github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6
+	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
-	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	nhooyr.io/websocket v1.8.7
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/klauspost/compress v1.10.3 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
+	github.com/lestrrat-go/strftime v1.0.5 // indirect
+	github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/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
+	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	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
 )

go.sum

@@ -1,139 +1,149 @@
 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/Mrs4s/MiraiGo v0.0.0-20201114105236-1ea9f982fee4 h1:0qoqKkSLTnWBS2rZm95ey9YYbCo4sujO4Kk2frw27yY=
+github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
-github.com/Mrs4s/MiraiGo v0.0.0-20201114105236-1ea9f982fee4/go.mod h1:pAsWtMIwqkBXr5DkUpTIHoWQJNduVnX9WSBPmPvkuCs=
+github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20201114105600-231b2d89dbb9 h1:evnR9D9rXcBTUzioFf7XlXX4KbZBhc0/Urp09yV01dc=
+github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E=
-github.com/Mrs4s/MiraiGo v0.0.0-20201114105600-231b2d89dbb9/go.mod h1:pAsWtMIwqkBXr5DkUpTIHoWQJNduVnX9WSBPmPvkuCs=
+github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww=
-github.com/Mrs4s/MiraiGo v0.0.0-20201114110437-3d349df7362e h1:cE3YcEtd9LWqtR4nyxciRg/qLaJ6jW9eO8I6ZW7oNDw=
+github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
-github.com/Mrs4s/MiraiGo v0.0.0-20201114110437-3d349df7362e/go.mod h1:pAsWtMIwqkBXr5DkUpTIHoWQJNduVnX9WSBPmPvkuCs=
+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/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/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU=
-github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
-github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
+github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
-github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c h1:mP9bsvdddRSMwqO+lmNuSrsH7nD2nBIz7af+e/4je4c=
-github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c/go.mod h1:goroSTghTcnjKaR2C8ovKWy1lEvRNfqHrW/kRJNMek0=
-github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 h1:8MYJU90rB1bsavemKSAuDKBjtAKo5xq95bEPOnzV7CE=
-github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
-github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
-github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
-github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
-github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
-github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
-github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.1.3 h1:BIiV6nnsA+R6dIB1P33uhCM8+TVAG3zHrXGZad7hDc8=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/guonaihong/gout v0.1.3/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
+github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
-github.com/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo=
+github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/kr/binarydist v0.1.0/go.mod h1:DY7S//GCoz1BCd0B0EVrinCKAZN3pXe+MDaIZbXQVgM=
+github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
-github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
+github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
+github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE=
-github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+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-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 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/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/segmentio/asm v1.0.0 h1:GMF7/2eLkte13LERSOmPI766AJXJDRlsqqiN8T7Mfmk=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/segmentio/asm v1.0.0/go.mod h1:4EUJGaKsB8ImLUwOGORVsNd9vTRDeh44JGsY4aKp5I4=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
+github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
+github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
+github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
+github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/gjson v1.6.3 h1:aHoiiem0dr7GHkW001T1SMTJ7X5PvyekH5WX0whWGnI=
+github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/gjson v1.6.3/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
+github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
-github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
-github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6 h1:lX18MCdNzT2zIi7K02x4C5cPkDXpL+wCb1YTAMXjLWQ=
+github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
-github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6/go.mod h1:5q9LFlBr+yX/J8Jd/9wHdXwkkjFkNyQIS7kX2Lgx/Zs=
+github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
-github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
-github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+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=
@@ -143,29 +153,44 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 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-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+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/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-20190423024810-112230192c58/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-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/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 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -181,18 +206,32 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
+modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
+modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
+nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

internal/base/feature.go

@@ -0,0 +1,37 @@
+package base
+
+import (
+	"io"
+
+	"github.com/pkg/errors"
+)
+
+// silk encode features
+var (
+	EncodeSilk   = encodeSilk   // 编码 SilkV3 音频
+	ResampleSilk = resampleSilk // 将silk重新编码为 24000 bit rate
+)
+
+func encodeSilk(_ []byte, _ string) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}
+
+func resampleSilk(data []byte) []byte {
+	return data
+}
+
+// Mime scan feature
+var (
+	IsLawfulImage = nocheck // 检查图片MIME
+	IsLawfulAudio = nocheck // 检查音频MIME
+)
+
+func nocheck(_ io.ReadSeeker) (bool, string) {
+	return true, ""
+}
+
+// todo: enable in v1.1.0
+// onebot v12 feature
+const (
+	AcceptOneBotV12HTTPEndPoint = false
+)

internal/base/flag.go

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

internal/base/version.go

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

internal/param/param.go

@@ -0,0 +1,130 @@
+// Package param provide some util for param parse
+package param
+
+import (
+	"math"
+	"reflect"
+	"regexp"
+	"strings"
+	"sync"
+
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/segmentio/asm/base64"
+	"github.com/tidwall/gjson"
+)
+
+// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
+//
+// 支持的合法类型有
+//
+// type bool
+//
+// type gjson.True or gjson.False
+//
+// type string "true","yes","1" or "false","no","0" (case insensitive)
+func EnsureBool(p interface{}, defaultVal bool) bool {
+	var str string
+	if b, ok := p.(bool); ok {
+		return b
+	}
+	if j, ok := p.(gjson.Result); ok {
+		if !j.Exists() {
+			return defaultVal
+		}
+		switch j.Type { // nolint
+		case gjson.True:
+			return true
+		case gjson.False:
+			return false
+		case gjson.String:
+			str = j.Str
+		default:
+			return defaultVal
+		}
+	} else if s, ok := p.(string); ok {
+		str = s
+	}
+	str = strings.ToLower(str)
+	switch str {
+	case "true", "yes", "1":
+		return true
+	case "false", "no", "0":
+		return false
+	default:
+		return defaultVal
+	}
+}
+
+var (
+	// once lazy compile the reg
+	once sync.Once
+	// reg is splitURL regex pattern.
+	reg *regexp.Regexp
+)
+
+// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
+func SplitURL(s string) []string {
+	once.Do(func() { // lazy init.
+		reg = regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
+	})
+	idx := reg.FindAllStringIndex(s, -1)
+	if len(idx) == 0 {
+		return []string{s}
+	}
+	var result []string
+	last := 0
+	for i := 0; i < len(idx); i++ {
+		if len(idx[i]) != 2 {
+			continue
+		}
+		m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
+		result = append(result, s[last:m])
+		last = m
+	}
+	result = append(result, s[last:])
+	return result
+}
+
+// Base64DecodeString decode base64 with avx2
+// see https://github.com/segmentio/asm/issues/50
+// avoid incorrect unsafe usage in origin library
+func Base64DecodeString(s string) ([]byte, error) {
+	e := base64.StdEncoding
+	dst := make([]byte, e.DecodedLen(len(s)))
+	n, err := e.Decode(dst, utils.S2B(s))
+	return dst[:n], err
+}
+
+// SetAtDefault 在变量 variable 为默认值 defaultValue 的时候修改为 value
+func SetAtDefault(variable, value, defaultValue interface{}) {
+	v := reflect.ValueOf(variable)
+	v2 := reflect.ValueOf(value)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		return
+	}
+	v = v.Elem()
+	if v.Interface() != defaultValue {
+		return
+	}
+	if v.Kind() != v2.Kind() {
+		return
+	}
+	v.Set(v2)
+}
+
+// SetExcludeDefault 在目标值 value 不为默认值 defaultValue 时修改 variable 为 value
+func SetExcludeDefault(variable, value, defaultValue interface{}) {
+	v := reflect.ValueOf(variable)
+	v2 := reflect.ValueOf(value)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		return
+	}
+	v = v.Elem()
+	if reflect.Indirect(v2).Interface() != defaultValue {
+		return
+	}
+	if v.Kind() != v2.Kind() {
+		return
+	}
+	v.Set(v2)
+}

internal/selfupdate/update.go

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

internal/selfupdate/update_others.go

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

internal/selfupdate/update_windows.go

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

login.go

@@ -0,0 +1,180 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"os"
+	"strings"
+	"time"
+
+	qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+	"github.com/tuotoo/qrcode"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+var console = bufio.NewReader(os.Stdin)
+
+func readLine() (str string) {
+	str, _ = console.ReadString('\n')
+	str = strings.TrimSpace(str)
+	return
+}
+
+func readLineTimeout(t time.Duration, de string) (str string) {
+	r := make(chan string)
+	go func() {
+		select {
+		case r <- readLine():
+		case <-time.After(t):
+		}
+	}()
+	str = de
+	select {
+	case str = <-r:
+	case <-time.After(t):
+	}
+	return
+}
+
+var cli *client.QQClient
+
+// ErrSMSRequestError SMS请求出错
+var ErrSMSRequestError = errors.New("sms request error")
+
+func commonLogin() error {
+	res, err := cli.Login()
+	if err != nil {
+		return err
+	}
+	return loginResponseProcessor(res)
+}
+
+func qrcodeLogin() error {
+	rsp, err := cli.FetchQRCode()
+	if err != nil {
+		return err
+	}
+	fi, err := qrcode.Decode(bytes.NewReader(rsp.ImageData))
+	if err != nil {
+		return err
+	}
+	_ = os.WriteFile("qrcode.png", rsp.ImageData, 0o644)
+	defer func() { _ = os.Remove("qrcode.png") }()
+	if cli.Uin != 0 {
+		log.Infof("请使用账号 %v 登录手机QQ扫描二维码 (qrcode.png) : ", cli.Uin)
+	} else {
+		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
+	}
+	time.Sleep(time.Second)
+	qrcodeTerminal.New().Get(fi.Content).Print()
+	s, err := cli.QueryQRCodeStatus(rsp.Sig)
+	if err != nil {
+		return err
+	}
+	prevState := s.State
+	for {
+		time.Sleep(time.Second)
+		s, _ = cli.QueryQRCodeStatus(rsp.Sig)
+		if s == nil {
+			continue
+		}
+		if prevState == s.State {
+			continue
+		}
+		prevState = s.State
+		switch s.State {
+		case client.QRCodeCanceled:
+			log.Fatalf("扫码被用户取消.")
+		case client.QRCodeTimeout:
+			log.Fatalf("二维码过期")
+		case client.QRCodeWaitingForConfirm:
+			log.Infof("扫码成功, 请在手机端确认登录.")
+		case client.QRCodeConfirmed:
+			res, err := cli.QRCodeLogin(s.LoginInfo)
+			if err != nil {
+				return err
+			}
+			return loginResponseProcessor(res)
+		case client.QRCodeImageFetch, client.QRCodeWaitingForScan:
+			// ignore
+		}
+	}
+}
+
+func loginResponseProcessor(res *client.LoginResponse) error {
+	var err error
+	for {
+		if err != nil {
+			return err
+		}
+		if res.Success {
+			return nil
+		}
+		var text string
+		switch res.Error {
+		case client.SliderNeededError:
+			log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
+			cli.Disconnect()
+			cli.Release()
+			cli = client.NewClientEmpty()
+			return qrcodeLogin()
+		case client.NeedCaptcha:
+			log.Warnf("登录需要验证码.")
+			_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
+			log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
+			text = readLine()
+			global.DelFile("captcha.jpg")
+			res, err = cli.SubmitCaptcha(text, res.CaptchaSign)
+			continue
+		case client.SMSNeededError:
+			log.Warnf("账号已开启设备锁, 按 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
+			readLine()
+			if !cli.RequestSMS() {
+				log.Warnf("发送验证码失败，可能是请求过于频繁.")
+				return errors.WithStack(ErrSMSRequestError)
+			}
+			log.Warn("请输入短信验证码： (Enter 提交)")
+			text = readLine()
+			res, err = cli.SubmitSMS(text)
+			continue
+		case client.SMSOrVerifyNeededError:
+			log.Warnf("账号已开启设备锁，请选择验证方式:")
+			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
+			log.Warnf("2. 使用手机QQ扫码验证.")
+			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
+			text = readLineTimeout(time.Second*10, "2")
+			if strings.Contains(text, "1") {
+				if !cli.RequestSMS() {
+					log.Warnf("发送验证码失败，可能是请求过于频繁.")
+					return errors.WithStack(ErrSMSRequestError)
+				}
+				log.Warn("请输入短信验证码： (Enter 提交)")
+				text = readLine()
+				res, err = cli.SubmitSMS(text)
+				continue
+			}
+			fallthrough
+		case client.UnsafeDeviceError:
+			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
+			log.Infof("按 Enter 或等待 5s 后继续....")
+			readLineTimeout(time.Second*5, "")
+			os.Exit(0)
+		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
+			msg := res.ErrorMessage
+			if strings.Contains(msg, "版本") {
+				msg = "密码错误或账号被冻结"
+			}
+			if strings.Contains(msg, "冻结") {
+				log.Fatalf("账号被冻结")
+			}
+			log.Warnf("登录失败: %v", msg)
+			log.Infof("按 Enter 或等待 5s 后继续....")
+			readLineTimeout(time.Second*5, "")
+			os.Exit(0)
+		}
+	}
+}

main.go

@@ -1,201 +1,134 @@
 package main
 
 import (
-	"bufio"
+	"crypto/aes"
 	"crypto/md5"
-	"encoding/base64"
+	"crypto/sha1"
-	"encoding/json"
+	"encoding/hex"
-	"fmt"
-	"github.com/Mrs4s/go-cqhttp/server"
-	"github.com/guonaihong/gout"
-	"github.com/tidwall/gjson"
-	"io"
-	"io/ioutil"
-	"net/http"
 	"os"
-	"os/signal"
 	"path"
-	"runtime"
+	"sync"
-	"strconv"
-	"strings"
 	"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/modules/mime" // mime检查模块
+	"github.com/Mrs4s/go-cqhttp/modules/servers"
+	_ "github.com/Mrs4s/go-cqhttp/modules/silk" // silk编码模块
+
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/getlantern/go-update"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
-	"github.com/lestrrat-go/file-rotatelogs"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/rifflock/lfshook"
+	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
-	log "github.com/sirupsen/logrus"
+	"github.com/Mrs4s/go-cqhttp/server"
-	"github.com/t-tomalak/logrus-easy-formatter"
 )
 
-func init() {
+// 允许通过配置文件设置的状态列表
-	log.SetFormatter(&easy.Formatter{
+var allowStatus = [...]client.UserOnlineStatus{
-		TimestampFormat: "2006-01-02 15:04:05",
+	client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
-		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
+	client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
-	})
+	client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
-	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
+	client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
-	if err == nil {
+	client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
-		log.SetOutput(io.MultiWriter(os.Stderr, w))
-	}
-	if !global.PathExists(global.IMAGE_PATH) {
-		if err := os.MkdirAll(global.IMAGE_PATH, 0755); err != nil {
-			log.Fatalf("创建图片缓存文件夹失败: %v", err)
-		}
-	}
-	if !global.PathExists(global.VOICE_PATH) {
-		if err := os.MkdirAll(global.VOICE_PATH, 0755); err != nil {
-			log.Fatalf("创建语音缓存文件夹失败: %v", err)
-		}
-	}
-	if !global.PathExists(global.VIDEO_PATH) {
-		if err := os.MkdirAll(global.VIDEO_PATH, 0755); err != nil {
-			log.Fatalf("创建视频缓存文件夹失败: %v", err)
-		}
-	}
-	if !global.PathExists(global.CACHE_PATH) {
-		if err := os.MkdirAll(global.CACHE_PATH, 0755); err != nil {
-			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
-		}
-	}
-	if global.PathExists("cqhttp.json") {
-		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
-		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.json 文件.")
-		time.Sleep(time.Second * 5)
-		conf := global.CQHttpApiConfig{}
-		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
-			log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
-		}
-		goConf := global.DefaultConfig()
-		goConf.AccessToken = conf.AccessToken
-		goConf.HttpConfig.Host = conf.Host
-		goConf.HttpConfig.Port = conf.Port
-		goConf.WSConfig.Host = conf.WSHost
-		goConf.WSConfig.Port = conf.WSPort
-		if conf.PostUrl != "" {
-			goConf.HttpConfig.PostUrls[conf.PostUrl] = conf.Secret
-		}
-		if conf.UseWsReverse {
-			goConf.ReverseServers[0].Enabled = true
-			goConf.ReverseServers[0].ReverseUrl = conf.WSReverseUrl
-			goConf.ReverseServers[0].ReverseApiUrl = conf.WSReverseApiUrl
-			goConf.ReverseServers[0].ReverseEventUrl = conf.WSReverseEventUrl
-			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
-		}
-		if err := goConf.Save("config.json"); err != nil {
-			log.Fatalf("保存 config.json 时出现错误: %v", err)
-		}
-		_ = os.Remove("cqhttp.json")
-	}
 }
 
 func main() {
-	console := bufio.NewReader(os.Stdin)
+	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, "发送图片")
+
+	var byteKey []byte
 	arg := os.Args
-	if len(arg) > 1 && arg[1] == "update" {
+	if len(arg) > 1 {
-		if len(arg) > 2 {
+		for i := range arg {
-			selfUpdate(arg[2])
+			switch arg[i] {
-		} else {
+			case "update":
-			selfUpdate("")
+				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
+			}
 		}
 	}
 
-	var conf *global.JsonConfig
+	if !base.FastStart && terminal.RunningByDoubleClick() {
-	if global.PathExists("config.json") || os.Getenv("UIN") == "" {
+		err := terminal.NoMoreDoubleClick()
-		conf = global.Load("config.json")
-	} else if os.Getenv("UIN") != "" {
-		log.Infof("将从环境变量加载配置.")
-		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
-		pwd := os.Getenv("PASS")
-		post := os.Getenv("HTTP_POST")
-		conf = &global.JsonConfig{
-			Uin:      uin,
-			Password: pwd,
-			HttpConfig: &global.GoCQHttpConfig{
-				Enabled:  true,
-				Host:     "0.0.0.0",
-				Port:     5700,
-				PostUrls: map[string]string{},
-			},
-			WSConfig: &global.GoCQWebsocketConfig{
-				Enabled: true,
-				Host:    "0.0.0.0",
-				Port:    6700,
-			},
-			PostMessageFormat: "string",
-			Debug:             os.Getenv("DEBUG") == "true",
-		}
-		if post != "" {
-			conf.HttpConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
-		}
-	}
-	if conf == nil {
-		err := global.DefaultConfig().Save("config.json")
 		if err != nil {
-			log.Fatalf("创建默认配置文件时出现错误: %v", err)
+			log.Errorf("遇到错误: %v", err)
-			return
+			time.Sleep(time.Second * 5)
 		}
-		log.Infof("默认配置文件已生成, 请编辑 config.json 后重启程序.")
-		time.Sleep(time.Second * 5)
-		return
-	}
-	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
-		log.Warnf("请修改 config.json 以添加账号密码.")
-		time.Sleep(time.Second * 5)
 		return
 	}
 
-	// log classified by level
+	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
-	// Collect all records up to the specified level (default level: warn)
+		log.Warn("账号密码未配置, 将使用二维码登录.")
-	logLevel := conf.LogLevel
+		if !base.FastStart {
-	if logLevel != "" {
+			log.Warn("将在 5秒 后继续.")
-		date := time.Now().Format("2006-01-02")
+			time.Sleep(time.Second * 5)
-		var logPathMap lfshook.PathMap
-		switch conf.LogLevel {
-		case "warn":
-			logPathMap = lfshook.PathMap{
-				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
-				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
-				log.FatalLevel: path.Join("logs", date+"-warn.log"),
-				log.PanicLevel: path.Join("logs", date+"-warn.log"),
-			}
-		case "error":
-			logPathMap = lfshook.PathMap{
-				log.ErrorLevel: path.Join("logs", date+"-error.log"),
-				log.FatalLevel: path.Join("logs", date+"-error.log"),
-				log.PanicLevel: path.Join("logs", date+"-error.log"),
-			}
-		default:
-			logPathMap = lfshook.PathMap{
-				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
-				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
-				log.FatalLevel: path.Join("logs", date+"-warn.log"),
-				log.PanicLevel: path.Join("logs", date+"-warn.log"),
-			}
 		}
-
-		log.AddHook(lfshook.NewHook(
-			logPathMap,
-			&easy.Formatter{
-				TimestampFormat: "2006-01-02 15:04:05",
-				LogFormat:       "[%time%] [%lvl%]: %msg% \n",
-			},
-		))
 	}
 
-	log.Info("当前版本:", coolq.Version)
+	log.Info("当前版本:", base.Version)
-	if conf.Debug {
+	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()
-		_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0644)
+		_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
 		log.Info("已生成设备信息并保存到 device.json 文件.")
 	} else {
 		log.Info("将使用 device.json 内的设备信息运行Bot.")
@@ -203,26 +136,63 @@ func main() {
 			log.Fatalf("加载设备信息失败: %v", err)
 		}
 	}
-	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
+
-		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+	if base.Account.Encrypt {
-		strKey, _ := console.ReadString('\n')
+		if !global.PathExists("password.encrypt") {
-		key := md5.Sum([]byte(strKey))
+			if base.Account.Password == "" {
-		if encrypted := EncryptPwd(conf.Password, key[:]); encrypted != "" {
+				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
-			conf.Password = ""
+				readLine()
-			conf.PasswordEncrypted = encrypted
+				os.Exit(0)
-			_ = conf.Save("config.json")
+			}
+			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 {
-			log.Warnf("加密时出现问题.")
+			if base.Account.Password != "" {
+				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+				readLine()
+				os.Exit(0)
+			}
+
+			if len(byteKey) == 0 {
+				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+				cancel := make(chan struct{}, 1)
+				state, _ := term.GetState(int(os.Stdin.Fd()))
+				go func() {
+					select {
+					case <-cancel:
+						return
+					case <-time.After(time.Second * 45):
+						log.Infof("解密key输入超时")
+						time.Sleep(3 * time.Second)
+						_ = term.Restore(int(os.Stdin.Fd()), state)
+						os.Exit(0)
+					}
+				}()
+				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+				cancel <- struct{}{}
+			} else {
+				log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+			}
+
+			encrypt, _ := os.ReadFile("password.encrypt")
+			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
+			if err != nil {
+				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+			}
+			copy(base.PasswordHash[:], ph)
 		}
+	} else if len(base.Account.Password) > 0 {
+		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 	}
-	if conf.PasswordEncrypted != "" {
+	if !base.FastStart {
-		log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
-		strKey, _ := console.ReadString('\n')
+		time.Sleep(time.Second * 5)
-		key := md5.Sum([]byte(strKey))
-		conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
 	}
-	log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
-	time.Sleep(time.Second * 5)
 	log.Info("开始尝试登录并同步消息...")
 	log.Infof("使用协议: %v", func() string {
 		switch client.SystemDeviceInfo.Protocol {
@@ -234,11 +204,187 @@ func main() {
 			return "Android Watch"
 		case client.MacOS:
 			return "MacOS"
+		case client.QiDian:
+			return "企点"
 		}
 		return "未知"
 	}())
-	cli := client.NewClient(conf.Uin, conf.Password)
+	cli = newClient()
-	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
+	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)
@@ -248,161 +394,5 @@ func main() {
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
-	if global.PathExists("address.txt") {
+	return c
-		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
-		addr := global.ReadAddrFile("address.txt")
-		if len(addr) > 0 {
-			cli.SetCustomServer(addr)
-		}
-		log.Infof("读取到 %v 个自定义地址.", len(addr))
-	}
-	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !conf.UseSSOAddress {
-			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			return false
-		}
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-		return true
-	})
-	if conf.WebUi == nil {
-		conf.WebUi = &global.GoCqWebUi{
-			Enabled:   true,
-			WebInput:  false,
-			Host:      "0.0.0.0",
-			WebUiPort: 9999,
-		}
-	}
-	if conf.WebUi.WebUiPort <= 0 {
-		conf.WebUi.WebUiPort = 9999
-	}
-	if conf.WebUi.Host == "" {
-		conf.WebUi.Host = "127.0.0.1"
-	}
-	confErr := conf.Save("config.json")
-	if confErr != nil {
-		log.Error("保存配置文件失败")
-	}
-	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
-	c := server.Console
-	go checkUpdate()
-	signal.Notify(c, os.Interrupt, os.Kill)
-	<-c
-	b.Release()
-}
-
-func EncryptPwd(pwd string, key []byte) string {
-	tea := binary.NewTeaCipher(key)
-	if tea == nil {
-		return ""
-	}
-	return base64.StdEncoding.EncodeToString(tea.Encrypt([]byte(pwd)))
-}
-
-func DecryptPwd(ePwd string, key []byte) string {
-	defer func() {
-		if pan := recover(); pan != nil {
-			log.Fatalf("密码解密失败: %v", pan)
-		}
-	}()
-	encrypted, err := base64.StdEncoding.DecodeString(ePwd)
-	if err != nil {
-		panic(err)
-	}
-	tea := binary.NewTeaCipher(key)
-	if tea == nil {
-		panic("密钥错误")
-	}
-	return string(tea.Decrypt(encrypted))
-}
-
-func checkUpdate() {
-	log.Infof("正在检查更新.")
-	if coolq.Version == "unknown" {
-		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
-		return
-	}
-	var res string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
-		log.Warnf("检查更新失败: %v", err)
-		return
-	}
-	detail := gjson.Parse(res)
-	if len(detail.Array()) < 1 {
-		return
-	}
-	info := detail.Array()[0]
-	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
-		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
-		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
-		return
-	}
-	log.Infof("检查更新完成. 当前已运行最新版本.")
-}
-
-func selfUpdate(imageUrl string) {
-	console := bufio.NewReader(os.Stdin)
-	readLine := func() (str string) {
-		str, _ = console.ReadString('\n')
-		return
-	}
-	log.Infof("正在检查更新.")
-	var res string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
-		log.Warnf("检查更新失败: %v", err)
-		return
-	}
-	detail := gjson.Parse(res)
-	if len(detail.Array()) < 1 {
-		return
-	}
-	info := detail.Array()[0]
-	version := info.Get("tag_name").Str
-	if coolq.Version != version {
-		log.Info("当前最新版本为 ", version)
-		log.Warn("是否更新(y/N): ")
-		r := strings.TrimSpace(readLine())
-
-		doUpdate := func() {
-			log.Info("正在更新,请稍等...")
-			url := fmt.Sprintf(
-				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
-				func() string {
-					if imageUrl != "" {
-						return imageUrl
-					}
-					return "https://github.com"
-				}(),
-				version,
-				version,
-				runtime.GOOS,
-				runtime.GOARCH,
-			)
-			if runtime.GOOS == "windows" {
-				url = url + ".exe"
-			}
-			resp, err := http.Get(url)
-			if err != nil {
-				fmt.Println(err)
-				log.Error("更新失败!")
-				return
-			}
-			wc := global.WriteCounter{}
-			err, _ = update.New().FromStream(io.TeeReader(resp.Body, &wc))
-			fmt.Println()
-			if err != nil {
-				log.Error("更新失败!")
-				return
-			}
-			log.Info("更新完成！")
-		}
-
-		if r == "y" || r == "Y" {
-			doUpdate()
-		} else {
-			log.Warn("已取消更新！")
-		}
-	}
-	log.Info("按 Enter 继续....")
-	readLine()
-	os.Exit(0)
 }

modules/config/config.go

@@ -0,0 +1,335 @@
+// Package config 包含go-cqhttp操作配置文件的相关函数
+package config
+
+import (
+	"bufio"
+	_ "embed" // embed the default config file
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/Mrs4s/go-cqhttp/internal/param"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
+)
+
+// defaultConfig 默认配置文件
+//go:embed default_config.yml
+var defaultConfig string
+
+// Reconnect 重连配置
+type Reconnect struct {
+	Disabled bool `yaml:"disabled"`
+	Delay    uint `yaml:"delay"`
+	MaxTimes uint `yaml:"max-times"`
+	Interval int  `yaml:"interval"`
+}
+
+// Account 账号配置
+type Account struct {
+	Uin           int64      `yaml:"uin"`
+	Password      string     `yaml:"password"`
+	Encrypt       bool       `yaml:"encrypt"`
+	Status        int        `yaml:"status"`
+	ReLogin       *Reconnect `yaml:"relogin"`
+	UseSSOAddress bool       `yaml:"use-sso-address"`
+}
+
+// Config 总配置文件
+type Config struct {
+	Account   *Account `yaml:"account"`
+	Heartbeat struct {
+		Disabled bool `yaml:"disabled"`
+		Interval int  `yaml:"interval"`
+	} `yaml:"heartbeat"`
+
+	Message struct {
+		PostFormat          string `yaml:"post-format"`
+		ProxyRewrite        string `yaml:"proxy-rewrite"`
+		IgnoreInvalidCQCode bool   `yaml:"ignore-invalid-cqcode"`
+		ForceFragment       bool   `yaml:"force-fragment"`
+		FixURL              bool   `yaml:"fix-url"`
+		ReportSelfMessage   bool   `yaml:"report-self-message"`
+		RemoveReplyAt       bool   `yaml:"remove-reply-at"`
+		ExtraReplyData      bool   `yaml:"extra-reply-data"`
+		SkipMimeScan        bool   `yaml:"skip-mime-scan"`
+	} `yaml:"message"`
+
+	Output struct {
+		LogLevel    string `yaml:"log-level"`
+		LogAging    int    `yaml:"log-aging"`
+		LogForceNew bool   `yaml:"log-force-new"`
+		Debug       bool   `yaml:"debug"`
+	} `yaml:"output"`
+
+	Servers  []map[string]yaml.Node `yaml:"servers"`
+	Database map[string]yaml.Node   `yaml:"database"`
+}
+
+// MiddleWares 通信中间件
+type MiddleWares struct {
+	AccessToken string `yaml:"access-token"`
+	Filter      string `yaml:"filter"`
+	RateLimit   struct {
+		Enabled   bool    `yaml:"enabled"`
+		Frequency float64 `yaml:"frequency"`
+		Bucket    int     `yaml:"bucket"`
+	} `yaml:"rate-limit"`
+}
+
+// HTTPServer HTTP通信相关配置
+type HTTPServer struct {
+	Disabled    bool   `yaml:"disabled"`
+	Host        string `yaml:"host"`
+	Port        int    `yaml:"port"`
+	Timeout     int32  `yaml:"timeout"`
+	LongPolling struct {
+		Enabled      bool `yaml:"enabled"`
+		MaxQueueSize int  `yaml:"max-queue-size"`
+	} `yaml:"long-polling"`
+	Post []struct {
+		URL    string `yaml:"url"`
+		Secret string `yaml:"secret"`
+	}
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// PprofServer pprof性能分析服务器相关配置
+type PprofServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Host     string `yaml:"host"`
+	Port     int    `yaml:"port"`
+}
+
+// WebsocketServer 正向WS相关配置
+type WebsocketServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Host     string `yaml:"host"`
+	Port     int    `yaml:"port"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// WebsocketReverse 反向WS相关配置
+type WebsocketReverse struct {
+	Disabled          bool   `yaml:"disabled"`
+	Universal         string `yaml:"universal"`
+	API               string `yaml:"api"`
+	Event             string `yaml:"event"`
+	ReconnectInterval int    `yaml:"reconnect-interval"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// LambdaServer 云函数配置
+type LambdaServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Type     string `yaml:"type"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// LevelDBConfig leveldb 相关配置
+type LevelDBConfig struct {
+	Enable bool `yaml:"enable"`
+}
+
+// Parse 从默认配置文件路径中获取
+func Parse(path string) *Config {
+	fromEnv := os.Getenv("GCQ_UIN") != ""
+
+	file, err := os.Open(path)
+	config := &Config{}
+	if err == nil {
+		defer func() { _ = file.Close() }()
+		if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv {
+			log.Fatal("配置文件不合法!", err)
+		}
+	} else if !fromEnv {
+		generateConfig()
+		os.Exit(0)
+	}
+	if fromEnv {
+		// type convert tools
+		toInt64 := func(str string) int64 {
+			i, _ := strconv.ParseInt(str, 10, 64)
+			return i
+		}
+
+		// load config from environment variable
+		param.SetAtDefault(&config.Account.Uin, toInt64(os.Getenv("GCQ_UIN")), int64(0))
+		param.SetAtDefault(&config.Account.Password, os.Getenv("GCQ_PWD"), "")
+		param.SetAtDefault(&config.Account.Status, int32(toInt64(os.Getenv("GCQ_STATUS"))), int32(0))
+		param.SetAtDefault(&config.Account.ReLogin.Disabled, !param.EnsureBool(os.Getenv("GCQ_RELOGIN_DISABLED"), true), false)
+		param.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0))
+		param.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0))
+		dbConf := &LevelDBConfig{Enable: param.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)}
+		if config.Database == nil {
+			config.Database = make(map[string]yaml.Node)
+		}
+		config.Database["leveldb"] = func() yaml.Node {
+			n := &yaml.Node{}
+			_ = n.Encode(dbConf)
+			return *n
+		}()
+		accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
+		if os.Getenv("GCQ_HTTP_PORT") != "" {
+			node := &yaml.Node{}
+			httpConf := &HTTPServer{
+				Host: "0.0.0.0",
+				Port: 5700,
+				MiddleWares: MiddleWares{
+					AccessToken: accessTokenEnv,
+				},
+			}
+			param.SetExcludeDefault(&httpConf.Disabled, param.EnsureBool(os.Getenv("GCQ_HTTP_DISABLE"), false), false)
+			param.SetExcludeDefault(&httpConf.Host, os.Getenv("GCQ_HTTP_HOST"), "")
+			param.SetExcludeDefault(&httpConf.Port, int(toInt64(os.Getenv("GCQ_HTTP_PORT"))), 0)
+			if os.Getenv("GCQ_HTTP_POST_URL") != "" {
+				httpConf.Post = append(httpConf.Post, struct {
+					URL    string `yaml:"url"`
+					Secret string `yaml:"secret"`
+				}{os.Getenv("GCQ_HTTP_POST_URL"), os.Getenv("GCQ_HTTP_POST_SECRET")})
+			}
+			_ = node.Encode(httpConf)
+			config.Servers = append(config.Servers, map[string]yaml.Node{"http": *node})
+		}
+		if os.Getenv("GCQ_WS_PORT") != "" {
+			node := &yaml.Node{}
+			wsServerConf := &WebsocketServer{
+				Host: "0.0.0.0",
+				Port: 6700,
+				MiddleWares: MiddleWares{
+					AccessToken: accessTokenEnv,
+				},
+			}
+			param.SetExcludeDefault(&wsServerConf.Disabled, param.EnsureBool(os.Getenv("GCQ_WS_DISABLE"), false), false)
+			param.SetExcludeDefault(&wsServerConf.Host, os.Getenv("GCQ_WS_HOST"), "")
+			param.SetExcludeDefault(&wsServerConf.Port, int(toInt64(os.Getenv("GCQ_WS_PORT"))), 0)
+			_ = node.Encode(wsServerConf)
+			config.Servers = append(config.Servers, map[string]yaml.Node{"ws": *node})
+		}
+		if os.Getenv("GCQ_RWS_API") != "" || os.Getenv("GCQ_RWS_EVENT") != "" || os.Getenv("GCQ_RWS_UNIVERSAL") != "" {
+			node := &yaml.Node{}
+			rwsConf := &WebsocketReverse{
+				MiddleWares: MiddleWares{
+					AccessToken: accessTokenEnv,
+				},
+			}
+			param.SetExcludeDefault(&rwsConf.Disabled, param.EnsureBool(os.Getenv("GCQ_RWS_DISABLE"), false), false)
+			param.SetExcludeDefault(&rwsConf.API, os.Getenv("GCQ_RWS_API"), "")
+			param.SetExcludeDefault(&rwsConf.Event, os.Getenv("GCQ_RWS_EVENT"), "")
+			param.SetExcludeDefault(&rwsConf.Universal, os.Getenv("GCQ_RWS_UNIVERSAL"), "")
+			_ = node.Encode(rwsConf)
+			config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node})
+		}
+	}
+	return config
+}
+
+// generateConfig 生成配置文件
+func generateConfig() {
+	fmt.Println("未找到配置文件，正在为您生成配置文件中！")
+	sb := strings.Builder{}
+	sb.WriteString(defaultConfig)
+	fmt.Print(`请选择你需要的通信方式:
+> 1: HTTP通信
+> 2: 正向 Websocket 通信
+> 3: 反向 Websocket 通信
+> 4: pprof 性能分析服务器
+> 5: 云函数服务
+请输入你需要的编号，可输入多个，同一编号也可输入多个(如: 233)
+您的选择是:`)
+	input := bufio.NewReader(os.Stdin)
+	readString, err := input.ReadString('\n')
+	if err != nil {
+		log.Fatal("输入不合法: ", err)
+	}
+	for _, r := range readString {
+		switch r {
+		case '1':
+			sb.WriteString(httpDefault)
+		case '2':
+			sb.WriteString(wsDefault)
+		case '3':
+			sb.WriteString(wsReverseDefault)
+		case '4':
+			sb.WriteString(pprofDefault)
+		case '5':
+			sb.WriteString(lambdaDefault)
+		}
+	}
+	_ = os.WriteFile("config.yml", []byte(sb.String()), 0o644)
+	fmt.Println("默认配置文件已生成，请修改 config.yml 后重新启动!")
+	_, _ = input.ReadString('\n')
+}
+
+const httpDefault = `  # HTTP 通信设置
+  - http:
+      # 服务端监听地址
+      host: 127.0.0.1
+      # 服务端监听端口
+      port: 5700
+      # 反向HTTP超时时间, 单位秒
+      # 最小值为5，小于5将会忽略本项设置
+      timeout: 5
+      # 长轮询拓展
+      long-polling:
+        # 是否开启
+        enabled: false
+        # 消息队列大小，0 表示不限制队列大小，谨慎使用
+        max-queue-size: 2000
+      middlewares:
+        <<: *default # 引用默认中间件
+      # 反向HTTP POST地址列表
+      post:
+      #- url: '' # 地址
+      #  secret: ''           # 密钥
+      #- url: 127.0.0.1:5701 # 地址
+      #  secret: ''          # 密钥
+`
+
+const lambdaDefault = `  # LambdaServer 配置
+  - lambda:
+      type: scf # scf: 腾讯云函数 aws: aws Lambda
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+const wsDefault = `  # 正向WS设置
+  - ws:
+      # 正向WS服务器监听地址
+      host: 127.0.0.1
+      # 正向WS服务器监听端口
+      port: 6700
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+const wsReverseDefault = `  # 反向WS设置
+  - ws-reverse:
+      # 反向WS Universal 地址
+      # 注意 设置了此项地址后下面两项将会被忽略
+      universal: ws://your_websocket_universal.server
+      # 反向WS API 地址
+      api: ws://your_websocket_api.server
+      # 反向WS Event 地址
+      event: ws://your_websocket_event.server
+      # 重连间隔 单位毫秒
+      reconnect-interval: 3000
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+const pprofDefault = `  # pprof 性能分析服务器, 一般情况下不需要启用.
+  # 如果遇到性能问题请上传报告给开发者处理
+  # 注意: pprof服务不支持中间件、不支持鉴权. 请不要开放到公网
+  - pprof:
+      # pprof服务器监听地址
+      host: 127.0.0.1
+      # pprof服务器监听端口
+      port: 7700
+`

modules/config/default_config.yml

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

modules/mime/mime.go

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

modules/servers/servers.go

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

modules/silk/codec.go

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

modules/silk/codec_unsupported.go

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

modules/silk/stubs.go

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

scripts/bootstrap

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

scripts/upload_dist.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ "$GITHUB_ACTIONS" != "true" ]; then
+    echo "This script is only meant to be run in GitHub Actions."
+    exit 1
+fi
+
+cp -f dist/*.tar.gz upstream/dist/downloads
+cp -f dist/*.zip upstream/dist/downloads
+cd upstream/dist || exit
+LATEST_VERSION="${GITHUB_REF#"refs/tags/"}"
+git config --local user.name 'Github Actions'
+git config --local user.email 'github-actions@users.noreply.github.com'
+git add --all
+git commit -m "update to $LATEST_VERSION"
+git tag -d "$LATEST_VERSION"
+git tag "$LATEST_VERSION"
+git push
+git push --tags

server/api.go

@@ -0,0 +1,455 @@
+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/apiAdmin.go

@@ -1,568 +0,0 @@
-package server
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	"github.com/yinghau76/go-ascii-art"
-	"image"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var WebInput = make(chan string, 1) //长度1，用于阻塞
-
-var Console = make(chan os.Signal, 1)
-
-var JsonConfig *global.JsonConfig
-
-type webServer struct {
-	engine  *gin.Engine
-	bot     *coolq.CQBot
-	Cli     *client.QQClient
-	Conf    *global.JsonConfig //old config
-	Console *bufio.Reader
-}
-
-var WebServer = &webServer{}
-
-// admin 子站的 路由映射
-var HttpuriAdmin = map[string]func(s *webServer, c *gin.Context){
-	"do_restart":        AdminDoRestart,       //热重启
-	"get_web_write":     AdminWebWrite,        //获取是否验证码输入
-	"do_web_write":      AdminDoWebWrite,      //web上进行输入操作
-	"do_restart_docker": AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起
-	"do_config_base":    AdminDoConfigBase,    //修改config.json中的基础部分
-	"do_config_http":    AdminDoConfigHttp,    //修改config.json的http部分
-	"do_config_ws":      AdminDoConfigWs,      //修改config.json的正向ws部分
-	"do_config_reverse": AdminDoConfigReverse, //修改config.json 中的反向ws部分
-	"do_config_json":    AdminDoConfigJson,    //直接修改 config.json配置
-	"get_config_json":   AdminGetConfigJson,   //拉取 当前的config.json配置
-}
-
-func Failed(code int, msg string) coolq.MSG {
-	return coolq.MSG{"data": nil, "retcode": code, "status": "failed", "msg": msg}
-}
-
-func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
-	s.Cli = cli
-	s.Conf = GetConf()
-	JsonConfig = s.Conf
-	gin.SetMode(gin.ReleaseMode)
-	s.engine = gin.New()
-
-	s.engine.Use(AuthMiddleWare())
-
-	//通用路由
-	s.engine.Any("/admin/:action", s.admin)
-
-	go func() {
-		//开启端口监听
-		if s.Conf.WebUi.Enabled {
-			log.Infof("Admin API 服务器已启动: %v", addr)
-			err := s.engine.Run(addr)
-			if err != nil {
-				log.Error(err)
-				log.Infof("请检查端口是否被占用.")
-				c := make(chan os.Signal, 1)
-				signal.Notify(c, os.Interrupt, os.Kill)
-				<-c
-				os.Exit(1)
-			}
-		} else {
-			//关闭端口监听
-			c := make(chan os.Signal, 1)
-			signal.Notify(c, os.Interrupt, os.Kill)
-			<-c
-			os.Exit(1)
-		}
-	}()
-	s.Dologin()
-	s.UpServer()
-	b := s.bot //外部引入 bot对象，用于操作bot
-	return b
-}
-
-func (s *webServer) Dologin() {
-	s.Console = bufio.NewReader(os.Stdin)
-	readLine := func() (str string) {
-		str, _ = s.Console.ReadString('\n')
-		return
-	}
-	conf := GetConf()
-	cli := s.Cli
-	cli.AllowSlider = true
-	rsp, err := cli.Login()
-	for {
-		global.Check(err)
-		var text string
-		if !rsp.Success {
-			switch rsp.Error {
-			case client.SliderNeededError:
-				if client.SystemDeviceInfo.Protocol == client.AndroidPhone {
-					log.Warnf("警告: Android Phone 强制要求暂不支持的滑条验证码, 请开启设备锁或切换到Watch协议验证通过后再使用.")
-					log.Infof("按 Enter 继续....")
-					readLine()
-					os.Exit(0)
-				}
-				cli.AllowSlider = false
-				cli.Disconnect()
-				rsp, err = cli.Login()
-				continue
-			case client.NeedCaptcha:
-				_ = ioutil.WriteFile("captcha.jpg", rsp.CaptchaImage, 0644)
-				img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
-				fmt.Println(asciiart.New("image", img).Art)
-				if conf.WebUi.WebInput {
-					log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", conf.WebUi.Host, conf.WebUi.WebUiPort)
-					text = <-WebInput
-				} else {
-					log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
-					text = readLine()
-				}
-				rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign)
-				global.DelFile("captcha.jpg")
-				continue
-			case client.SMSNeededError:
-				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", rsp.SMSPhone)
-				readLine()
-				if !cli.RequestSMS() {
-					log.Warnf("发送验证码失败，可能是请求过于频繁.")
-					time.Sleep(time.Second * 5)
-					os.Exit(0)
-				}
-				log.Warn("请输入短信验证码： (Enter 提交)")
-				text = readLine()
-				rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
-				continue
-			case client.SMSOrVerifyNeededError:
-				log.Warnf("账号已开启设备锁，请选择验证方式:")
-				log.Warnf("1. 向手机 %v 发送短信验证码", rsp.SMSPhone)
-				log.Warnf("2. 使用手机QQ扫码验证.")
-				log.Warn("请输入(1 - 2): ")
-				text = readLine()
-				if strings.Contains(text, "1") {
-					if !cli.RequestSMS() {
-						log.Warnf("发送验证码失败，可能是请求过于频繁.")
-						time.Sleep(time.Second * 5)
-						os.Exit(0)
-					}
-					log.Warn("请输入短信验证码： (Enter 提交)")
-					text = readLine()
-					rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
-					continue
-				}
-				log.Warnf("请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
-				log.Infof("按 Enter 继续....")
-				readLine()
-				os.Exit(0)
-				return
-			case client.UnsafeDeviceError:
-				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
-				if conf.WebUi.WebInput {
-					log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", conf.WebUi.Host, conf.WebUi.WebUiPort)
-					text = <-WebInput
-				} else {
-					log.Infof("按 Enter 继续....")
-					readLine()
-				}
-				log.Info(text)
-				os.Exit(0)
-				return
-			case client.OtherLoginError, client.UnknownLoginError:
-				msg := rsp.ErrorMessage
-				if strings.Contains(msg, "版本") {
-					msg = "密码错误或账号被冻结"
-				}
-				log.Warnf("登录失败: %v", msg)
-				log.Infof("按 Enter 继续....")
-				readLine()
-				os.Exit(0)
-				return
-			}
-		}
-		break
-	}
-	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
-	time.Sleep(time.Second)
-	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList())
-	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
-	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList())
-	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	s.bot = coolq.NewQQBot(cli, conf)
-	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
-		log.Warnf("post_message_format 配置错误, 将自动使用 string")
-		coolq.SetMessageFormat("string")
-	} else {
-		coolq.SetMessageFormat(conf.PostMessageFormat)
-	}
-	if conf.RateLimit.Enabled {
-		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
-	}
-	log.Info("正在加载事件过滤器.")
-	global.BootFilter()
-	global.InitCodec()
-	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
-	coolq.ForceFragmented = conf.ForceFragmented
-	log.Info("资源初始化完成, 开始处理信息.")
-	log.Info("アトリは、高性能ですから!")
-	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
-		if conf.ReLogin.Enabled {
-			var times uint = 1
-			for {
-				if cli.Online {
-					log.Warn("Bot已登录")
-					return
-				}
-				if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
-					break
-				}
-				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
-					e.Message, conf.ReLogin.ReLoginDelay, times)
-				times++
-				time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
-				rsp, err := cli.Login()
-				if err != nil {
-					log.Errorf("重连失败: %v", err)
-					cli.Disconnect()
-					continue
-				}
-				if !rsp.Success {
-					switch rsp.Error {
-					case client.NeedCaptcha:
-						log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)")
-					case client.UnsafeDeviceError:
-						log.Fatalf("重连失败: 设备锁")
-					default:
-						log.Errorf("重连失败: %v", rsp.ErrorMessage)
-						cli.Disconnect()
-						continue
-					}
-				}
-				log.Info("重连成功")
-				return
-			}
-			log.Fatal("重连失败: 重连次数达到设置的上限值")
-		}
-		s.bot.Release()
-		log.Fatalf("Bot已离线：%v", e.Message)
-	})
-}
-
-func (s *webServer) admin(c *gin.Context) {
-	action := c.Param("action")
-	log.Debugf("WebServer接收到cgi调用: %v", action)
-	if f, ok := HttpuriAdmin[action]; ok {
-		f(s, c)
-	} else {
-		c.JSON(200, coolq.Failed(404))
-	}
-}
-
-// 获取当前配置文件信息
-func GetConf() *global.JsonConfig {
-	if JsonConfig != nil {
-		return JsonConfig
-	}
-	conf := global.Load("config.json")
-	return conf
-}
-
-// admin 控制器 登录验证
-func AuthMiddleWare() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		conf := GetConf()
-		//处理跨域问题
-		c.Header("Access-Control-Allow-Origin", "*")
-		c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
-		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE")
-		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
-		c.Header("Access-Control-Allow-Credentials", "true")
-		// 放行所有OPTIONS方法，因为有的模板是要请求两次的
-		if c.Request.Method == "OPTIONS" {
-			c.AbortWithStatus(http.StatusNoContent)
-		}
-		// 处理请求
-		if c.Request.Method != "GET" && c.Request.Method != "POST" {
-			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
-			c.Status(404)
-			c.Abort()
-		}
-		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
-			d, err := c.GetRawData()
-			if err != nil {
-				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
-				c.Status(400)
-				c.Abort()
-			}
-			if !gjson.ValidBytes(d) {
-				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
-				c.Status(400)
-				c.Abort()
-			}
-			c.Set("json_body", gjson.ParseBytes(d))
-		}
-		authToken := conf.AccessToken
-		if auth := c.Request.Header.Get("Authorization"); auth != "" {
-			if strings.SplitN(auth, " ", 2)[1] != authToken {
-				c.AbortWithStatus(401)
-				return
-			}
-		} else if c.Query("access_token") != authToken {
-			c.AbortWithStatus(401)
-			return
-		} else {
-			c.Next()
-		}
-	}
-}
-
-func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
-	JsonConfig = nil
-	conf := GetConf()
-	OldConf := s.Conf
-	cli := client.NewClient(conf.Uin, conf.Password)
-	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"
-		}
-		return "未知"
-	}())
-	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
-		switch e.Type {
-		case "INFO":
-			log.Info("Protocol -> " + e.Message)
-		case "ERROR":
-			log.Error("Protocol -> " + e.Message)
-		case "DEBUG":
-			log.Debug("Protocol -> " + e.Message)
-		}
-	})
-	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !conf.UseSSOAddress {
-			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			return false
-		}
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-		return true
-	})
-	s.Cli = cli
-	s.Dologin()
-	//关闭之前的 server
-	if OldConf.HttpConfig != nil && OldConf.HttpConfig.Enabled {
-		HttpServer.ShutDown()
-	}
-	//if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
-	//	server.WsShutdown()
-	//}
-	//s.UpServer()
-	s.ReloadServer()
-	s.Conf = conf
-}
-
-func (s *webServer) UpServer() {
-	conf := GetConf()
-	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
-		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, s.bot)
-		for k, v := range conf.HttpConfig.PostUrls {
-			NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, s.bot)
-		}
-	}
-	if conf.WSConfig != nil && conf.WSConfig.Enabled {
-		go WebsocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, s.bot)
-	}
-	for _, rc := range conf.ReverseServers {
-		go NewWebsocketClient(rc, conf.AccessToken, s.bot).Run()
-	}
-}
-
-// 暂不支持ws服务的重启
-func (s *webServer) ReloadServer() {
-	conf := GetConf()
-	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
-		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, s.bot)
-		for k, v := range conf.HttpConfig.PostUrls {
-			NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, s.bot)
-		}
-	}
-	for _, rc := range conf.ReverseServers {
-		go NewWebsocketClient(rc, conf.AccessToken, s.bot).Run()
-	}
-}
-
-// 热重启
-func AdminDoRestart(s *webServer, c *gin.Context) {
-	s.bot.Release()
-	s.bot = nil
-	s.Cli = nil
-	s.DoReLogin()
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
-}
-
-// 冷重启
-func AdminDoRestartDocker(s *webServer, c *gin.Context) {
-	Console <- os.Kill
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
-}
-
-// web输入 html 页面
-func AdminWebWrite(s *webServer, c *gin.Context) {
-	pic := global.ReadAllText("captcha.jpg")
-	var picbase64 string
-	var ispic = false
-	if pic != "" {
-		input := []byte(pic)
-		// base64编码
-		picbase64 = base64.StdEncoding.EncodeToString(input)
-		ispic = true
-	}
-	c.JSON(200, coolq.OK(coolq.MSG{
-		"ispic":     ispic,     //为空则为 设备锁 或者没有需要输入
-		"picbase64": picbase64, //web上显示图片
-	}))
-}
-
-// web输入 处理
-func AdminDoWebWrite(s *webServer, c *gin.Context) {
-	input := c.PostForm("input")
-	WebInput <- input
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-}
-
-// 普通配置修改
-func AdminDoConfigBase(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	conf.Uin, _ = strconv.ParseInt(c.PostForm("uin"), 10, 64)
-	conf.Password = c.PostForm("password")
-	if c.PostForm("enable_db") == "true" {
-		conf.EnableDB = true
-	} else {
-		conf.EnableDB = false
-	}
-	conf.AccessToken = c.PostForm("access_token")
-	if err := conf.Save("config.json"); err != nil {
-		log.Fatalf("保存 config.json 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JsonConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// http配置修改
-func AdminDoConfigHttp(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
-	conf.HttpConfig.Port = uint16(p)
-	conf.HttpConfig.Host = c.PostForm("host")
-	if c.PostForm("enable") == "true" {
-		conf.HttpConfig.Enabled = true
-	} else {
-		conf.HttpConfig.Enabled = false
-	}
-	t, _ := strconv.ParseInt(c.PostForm("timeout"), 10, 32)
-	conf.HttpConfig.Timeout = int32(t)
-	if c.PostForm("post_url") != "" {
-		conf.HttpConfig.PostUrls[c.PostForm("post_url")] = c.PostForm("post_secret")
-	}
-	if err := conf.Save("config.json"); err != nil {
-		log.Fatalf("保存 config.json 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JsonConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// ws配置修改
-func AdminDoConfigWs(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
-	conf.WSConfig.Port = uint16(p)
-	conf.WSConfig.Host = c.PostForm("host")
-	if c.PostForm("enable") == "true" {
-		conf.WSConfig.Enabled = true
-	} else {
-		conf.WSConfig.Enabled = false
-	}
-	if err := conf.Save("config.json"); err != nil {
-		log.Fatalf("保存 config.json 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JsonConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// 反向ws配置修改
-func AdminDoConfigReverse(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	conf.ReverseServers[0].ReverseApiUrl = c.PostForm("reverse_api_url")
-	conf.ReverseServers[0].ReverseUrl = c.PostForm("reverse_url")
-	conf.ReverseServers[0].ReverseEventUrl = c.PostForm("reverse_event_url")
-	t, _ := strconv.ParseUint(c.PostForm("reverse_reconnect_interval"), 10, 16)
-	conf.ReverseServers[0].ReverseReconnectInterval = uint16(t)
-	if c.PostForm("enable") == "true" {
-		conf.ReverseServers[0].Enabled = true
-	} else {
-		conf.ReverseServers[0].Enabled = false
-	}
-	if err := conf.Save("config.json"); err != nil {
-		log.Fatalf("保存 config.json 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JsonConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// config.json配置修改
-func AdminDoConfigJson(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	Json := c.PostForm("json")
-	err := json.Unmarshal([]byte(Json), &conf)
-	if err != nil {
-		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", "config.json", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-		return
-	}
-	if err := conf.Save("config.json"); err != nil {
-		log.Fatalf("保存 config.json 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.json 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JsonConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// 拉取config.json配置
-func AdminGetConfigJson(s *webServer, c *gin.Context) {
-	conf := GetConf()
-	c.JSON(200, coolq.OK(coolq.MSG{"config": conf}))
-
-}

server/daemon.go

@@ -0,0 +1,50 @@
+package server
+
+// daemon 功能写在这，目前仅支持了-d 作为后台运行参数，stop，start，restart这些功能目前看起来并不需要，可以通过api控制，后续需要的话再补全。
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// Daemon go-cqhttp server 的 daemon的实现函数
+func Daemon() {
+	args := os.Args[1:]
+
+	execArgs := make([]string, 0)
+
+	l := len(args)
+	for i := 0; i < l; i++ {
+		if strings.Index(args[i], "-d") == 0 {
+			continue
+		}
+
+		execArgs = append(execArgs, args[i])
+	}
+
+	proc := exec.Command(os.Args[0], execArgs...)
+	err := proc.Start()
+	if err != nil {
+		panic(err)
+	}
+
+	log.Info("[PID] ", proc.Process.Pid)
+	// pid写入到pid文件中，方便后续stop的时候kill
+	pidErr := savePid("go-cqhttp.pid", fmt.Sprintf("%d", proc.Process.Pid))
+	if pidErr != nil {
+		log.Errorf("save pid file error: %v", pidErr)
+	}
+
+	os.Exit(0)
+}
+
+// savePid 保存pid到文件中，便于后续restart/stop的时候kill pid用。
+func savePid(path string, data string) error {
+	return global.WriteAllText(path, data)
+}

server/doc.go

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

server/http.go

@@ -5,518 +5,288 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
-	"github.com/guonaihong/gout/dataflow"
+	"encoding/json"
+	"fmt"
+	"io"
+	"math/rand"
 	"net/http"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/gin-gonic/gin"
-	"github.com/guonaihong/gout"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
 type httpServer struct {
-	engine *gin.Engine
+	HTTP        *http.Server
-	bot    *coolq.CQBot
+	api         *apiCaller
-	Http   *http.Server
+	accessToken string
 }
 
-type httpClient struct {
+// HTTPClient 反向HTTP上报客户端
+type HTTPClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
+	filter  string
+	apiPort int
 	timeout int32
 }
 
-var HttpServer = &httpServer{}
+type httpCtx struct {
+	json     gjson.Result
+	query    url.Values
+	postForm url.Values
+}
 
-func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
+func (h *httpCtx) Get(s string) gjson.Result {
-	gin.SetMode(gin.ReleaseMode)
+	j := h.json.Get(s)
-	s.engine = gin.New()
+	if j.Exists() {
-	s.bot = bot
+		return j
-	s.engine.Use(func(c *gin.Context) {
+	}
-		if c.Request.Method != "GET" && c.Request.Method != "POST" {
+	validJSONParam := func(p string) bool {
-			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
+		return (strings.HasPrefix(p, "{") || strings.HasPrefix(p, "[")) && gjson.Valid(p)
-			c.Status(404)
+	}
-			return
+	if h.postForm != nil {
+		if form := h.postForm.Get(s); form != "" {
+			if validJSONParam(form) {
+				return gjson.Result{Type: gjson.JSON, Raw: form}
+			}
+			return gjson.Result{Type: gjson.String, Str: form}
 		}
-		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
+	}
-			d, err := c.GetRawData()
+	if h.query != nil {
+		if query := h.query.Get(s); query != "" {
+			if validJSONParam(query) {
+				return gjson.Result{Type: gjson.JSON, Raw: query}
+			}
+			return gjson.Result{Type: gjson.String, Str: query}
+		}
+	}
+	return gjson.Result{}
+}
+
+func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
+	var ctx httpCtx
+	contentType := request.Header.Get("Content-Type")
+	switch request.Method {
+	case http.MethodPost:
+		if strings.Contains(contentType, "application/json") {
+			body, err := io.ReadAll(request.Body)
 			if err != nil {
-				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
+				log.Warnf("获取请求 %v 的Body时出现错误: %v", request.RequestURI, err)
-				c.Status(400)
+				writer.WriteHeader(http.StatusBadRequest)
 				return
 			}
-			if !gjson.ValidBytes(d) {
+			if !gjson.ValidBytes(body) {
-				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
+				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", request.RemoteAddr)
-				c.Status(400)
+				writer.WriteHeader(http.StatusBadRequest)
 				return
 			}
-			c.Set("json_body", gjson.ParseBytes(d))
+			ctx.json = gjson.Parse(utils.B2S(body))
 		}
-		c.Next()
+		if strings.Contains(contentType, "application/x-www-form-urlencoded") {
-	})
+			err := request.ParseForm()
-
+			if err != nil {
-	if authToken != "" {
+				log.Warnf("已拒绝客户端 %v 的请求: %v", request.RemoteAddr, err)
-		s.engine.Use(func(c *gin.Context) {
+				writer.WriteHeader(http.StatusBadRequest)
-			if auth := c.Request.Header.Get("Authorization"); auth != "" {
-				if strings.SplitN(auth, " ", 2)[1] != authToken {
-					c.AbortWithStatus(401)
-					return
-				}
-			} else if c.Query("access_token") != authToken {
-				c.AbortWithStatus(401)
-				return
-			} else {
-				c.Next()
 			}
-		})
+			ctx.postForm = request.PostForm
+		}
+		fallthrough
+	case http.MethodGet:
+		ctx.query = request.URL.Query()
+
+	default:
+		log.Warnf("已拒绝客户端 %v 的请求: 方法错误", request.RemoteAddr)
+		writer.WriteHeader(http.StatusNotFound)
+		return
+	}
+	if status := checkAuth(request, s.accessToken); status != http.StatusOK {
+		writer.WriteHeader(status)
+		return
 	}
 
-	s.engine.Any("/:action", s.HandleActions)
+	var response global.MSG
+	if base.AcceptOneBotV12HTTPEndPoint && 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"))
+	} else {
+		action := strings.TrimPrefix(request.URL.Path, "/")
+		action = strings.TrimSuffix(action, "_async")
+		log.Debugf("HTTPServer接收到API调用: %v", action)
+		response = s.api.callAPI(action, &ctx)
+	}
+
+	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
+	writer.WriteHeader(http.StatusOK)
+	_ = json.NewEncoder(writer).Encode(response)
+}
+
+func checkAuth(req *http.Request, token string) int {
+	if token == "" { // quick path
+		return http.StatusOK
+	}
+
+	auth := req.Header.Get("Authorization")
+	if auth == "" {
+		auth = req.URL.Query().Get("access_token")
+	} else {
+		authN := strings.SplitN(auth, " ", 2)
+		if len(authN) == 2 {
+			auth = authN[1]
+		}
+	}
+
+	switch auth {
+	case token:
+		return http.StatusOK
+	case "":
+		return http.StatusUnauthorized
+	default:
+		return http.StatusForbidden
+	}
+}
+
+// runHTTP 启动HTTP服务器与HTTP上报客户端
+func runHTTP(bot *coolq.CQBot, node yaml.Node) {
+	var conf config.HTTPServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取http配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
+		return
+	}
+
+	var addr string
+	s := &httpServer{accessToken: conf.AccessToken}
+	if conf.Host == "" || conf.Port == 0 {
+		goto client
+	}
+	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	s.api = newAPICaller(bot)
+	if conf.RateLimit.Enabled {
+		s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+	}
+	if conf.LongPolling.Enabled {
+		s.api.use(longPolling(bot, conf.LongPolling.MaxQueueSize))
+	}
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		s.Http = &http.Server{
+		s.HTTP = &http.Server{
 			Addr:    addr,
-			Handler: s.engine,
+			Handler: s,
 		}
-		if err := s.Http.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
-			log.Infof("请检查端口是否被占用.")
+			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
+			log.Warnf("将在五秒后退出.")
 			time.Sleep(time.Second * 5)
 			os.Exit(1)
 		}
-		//err := s.engine.Run(addr)
-		//if err != nil {
-		//	log.Error(err)
-		//	log.Infof("请检查端口是否被占用.")
-		//	time.Sleep(time.Second * 5)
-		//	os.Exit(1)
-		//}
 	}()
+client:
+	for _, c := range conf.Post {
+		if c.URL != "" {
+			go HTTPClient{
+				bot:     bot,
+				secret:  c.Secret,
+				addr:    c.URL,
+				apiPort: conf.Port,
+				filter:  conf.Filter,
+				timeout: conf.Timeout,
+			}.Run()
+		}
+	}
 }
 
-func NewHttpClient() *httpClient {
+// Run 运行反向HTTP服务
-	return &httpClient{}
+func (c HTTPClient) Run() {
-}
+	addFilter(c.filter)
-
-func (c *httpClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
-	c.bot = bot
-	c.secret = secret
-	c.addr = addr
-	c.timeout = timeout
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
-	bot.OnEventPush(c.onBotPushEvent)
+	c.bot.OnEventPush(c.onBotPushEvent)
-	log.Infof("HTTP POST上报器已启动: %v", addr)
+	log.Infof("HTTP POST上报器已启动: %v", c.addr)
 }
 
-func (c *httpClient) onBotPushEvent(m coolq.MSG) {
+func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
-	var res string
+	if c.filter != "" {
-	err := gout.POST(c.addr).SetJSON(m).BindBody(&res).SetHeader(func() gout.H {
+		filter := findFilter(c.filter)
-		h := gout.H{
+		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-			"X-Self-ID":  c.bot.Client.Uin,
+			log.Debugf("上报Event %v 到 HTTP 服务器 %s 时被过滤.", c.addr, e.JSONBytes())
-			"User-Agent": "CQHttp/4.15.0",
+			return
 		}
-		if c.secret != "" {
+	}
-			mac := hmac.New(sha1.New, []byte(c.secret))
+
-			mac.Write([]byte(m.ToJson()))
+	client := http.Client{Timeout: time.Second * time.Duration(c.timeout)}
-			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
+	req, _ := http.NewRequest("POST", c.addr, nil)
+	req.Header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
+	req.Header.Set("User-Agent", "CQHttp/4.15.0")
+	if c.secret != "" {
+		mac := hmac.New(sha1.New, []byte(c.secret))
+		_, _ = mac.Write(e.JSONBytes())
+		req.Header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
+	}
+	if c.apiPort != 0 {
+		req.Header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
+	}
+
+	var res *http.Response
+	var err error
+	const maxAttemptTimes = 5
+
+	for i := 0; i <= maxAttemptTimes; i++ {
+		res, err = client.Do(req)
+		if err == nil {
+			//goland:noinspection GoDeferInLoop
+			defer res.Body.Close()
+			break
 		}
-		return h
+		if i != maxAttemptTimes {
-	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
+			log.Warnf("上报 Event 数据到 %v 失败: %v 将进行第 %d 次重试", c.addr, err, i+1)
-		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
+		}
-		Func(func(con *dataflow.Context) error {
+		const maxWait = int64(time.Second * 3)
-			if con.Error != nil {
+		const minWait = int64(time.Millisecond * 500)
-				log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
+		wait := rand.Int63n(maxWait-minWait) + minWait
-				return con.Error
+		time.Sleep(time.Duration(wait))
-			}
+	}
-			return nil
+
-		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
+		log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %v 到 %v", m.ToJson(), c.addr)
+	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
-	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJson()), gjson.Parse(res))
-	}
-}
 
-func (s *httpServer) HandleActions(c *gin.Context) {
+	r, err := io.ReadAll(res.Body)
-	global.RateLimit(context.Background())
+	if err != nil {
-	action := strings.ReplaceAll(c.Param("action"), "_async", "")
-	log.Debugf("HTTPServer接收到API调用: %v", action)
-	if f, ok := httpApi[action]; ok {
-		f(s, c)
-	} else {
-		c.JSON(200, coolq.Failed(404))
-	}
-}
-
-func GetLoginInfo(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetLoginInfo())
-}
-
-func GetFriendList(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetFriendList())
-}
-
-func GetGroupList(s *httpServer, c *gin.Context) {
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
-}
-
-func GetGroupInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupInfo(gid))
-}
-
-func GetGroupMemberList(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
-}
-
-func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
-}
-
-func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
-}
-
-func GetGroupRootFiles(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
-}
-
-func GetGroupFilesByFolderId(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	folderId := getParam(c, "folder_id")
-	c.JSON(200, s.bot.CQGetGroupFilesByFolderId(gid, folderId))
-}
-
-func GetGroupFileUrl(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	fid := getParam(c, "file_id")
-	busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
-	c.JSON(200, s.bot.CQGetGroupFileUrl(gid, fid, int32(busid)))
-}
-
-func SendMessage(s *httpServer, c *gin.Context) {
-	if getParam(c, "message_type") == "private" {
-		SendPrivateMessage(s, c)
 		return
 	}
-	if getParam(c, "message_type") == "group" {
+	if gjson.ValidBytes(r) {
-		SendGroupMessage(s, c)
+		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.ParseBytes(r))
-		return
 	}
-	if getParam(c, "group_id") != "" {
-		SendGroupMessage(s, c)
-		return
-	}
-	if getParam(c, "user_id") != "" {
-		SendPrivateMessage(s, c)
-	}
-}
-
-func SendPrivateMessage(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
-}
-
-func SendGroupMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
-}
-
-func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg := getParam(c, "messages")
-	c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
-}
-
-func GetImage(s *httpServer, c *gin.Context) {
-	file := getParam(c, "file")
-	c.JSON(200, s.bot.CQGetImage(file))
-}
-
-func GetMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQGetMessage(int32(mid)))
-}
-
-func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
-}
-
-func ProcessFriendRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
-}
-
-func ProcessGroupRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	subType := getParam(c, "sub_type")
-	if subType == "" {
-		subType = getParam(c, "type")
-	}
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
-}
-
-func SetGroupCard(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
-}
-
-func SetSpecialTitle(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
-}
-
-func SetGroupKick(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg := getParam(c, "message")
-	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg))
-}
-
-func SetGroupBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
-}
-
-func SetWholeBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-func SetGroupName(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
-}
-
-func SetGroupAdmin(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-func SendGroupNotice(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
-}
-
-func SetGroupLeave(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupLeave(gid))
-}
-
-func GetForwardMessage(s *httpServer, c *gin.Context) {
-	resId := getParam(c, "message_id")
-	c.JSON(200, s.bot.CQGetForwardMessage(resId))
-}
-
-func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetGroupSystemMessages())
-}
-
-func DeleteMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
-}
-
-func CanSendImage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendImage())
-}
-
-func CanSendRecord(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendRecord())
-}
-
-func GetStatus(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetStatus())
-}
-
-func GetVersionInfo(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetVersionInfo())
-}
-
-func ReloadEventFilter(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQReloadEventFilter())
-}
-
-func GetVipInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetVipInfo(uid))
-}
-
-func GetStrangerInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
-}
-
-func HandleQuickOperation(s *httpServer, c *gin.Context) {
-	if c.Request.Method != "POST" {
-		c.AbortWithStatus(404)
-		return
-	}
-	if i, ok := c.Get("json_body"); ok {
-		body := i.(gjson.Result)
-		c.JSON(200, s.bot.CQHandleQuickOperation(body.Get("context"), body.Get("operation")))
-	}
-}
-
-func OcrImage(s *httpServer, c *gin.Context) {
-	img := getParam(c, "image")
-	c.JSON(200, s.bot.CQOcrImage(img))
-}
-
-func GetWordSlices(s *httpServer, c *gin.Context) {
-	content := getParam(c, "content")
-	c.JSON(200, s.bot.CQGetWordSlices(content))
-}
-
-func SetGroupPortrait(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	file := getParam(c, "file")
-	cache := getParam(c, "cache")
-	c.JSON(200, s.bot.CQSetGroupPortrait(gid, file, cache))
-}
-
-func getParamOrDefault(c *gin.Context, k, def string) string {
-	r := getParam(c, k)
-	if r != "" {
-		return r
-	}
-	return def
-}
-
-func getParam(c *gin.Context, k string) string {
-	p, _ := getParamWithType(c, k)
-	return p
-}
-
-func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
-	if q := c.Query(k); q != "" {
-		return q, gjson.Null
-	}
-	if c.Request.Method == "POST" {
-		if h := c.Request.Header.Get("Content-Type"); h != "" {
-			if strings.Contains(h, "application/x-www-form-urlencoded") {
-				if p, ok := c.GetPostForm(k); ok {
-					return p, gjson.Null
-				}
-			}
-			if strings.Contains(h, "application/json") {
-				if obj, ok := c.Get("json_body"); ok {
-					res := obj.(gjson.Result).Get(k)
-					if res.Exists() {
-						switch res.Type {
-						case gjson.JSON:
-							return res.Raw, gjson.JSON
-						case gjson.String:
-							return res.Str, gjson.String
-						case gjson.Number:
-							return strconv.FormatInt(res.Int(), 10), gjson.Number // 似乎没有需要接受 float 类型的api
-						case gjson.True:
-							return "true", gjson.True
-						case gjson.False:
-							return "false", gjson.False
-						}
-					}
-				}
-			}
-		}
-	}
-	return "", gjson.Null
-}
-
-var httpApi = map[string]func(s *httpServer, c *gin.Context){
-	"get_login_info":             GetLoginInfo,
-	"get_friend_list":            GetFriendList,
-	"get_group_list":             GetGroupList,
-	"get_group_info":             GetGroupInfo,
-	"get_group_member_list":      GetGroupMemberList,
-	"get_group_member_info":      GetGroupMemberInfo,
-	"get_group_file_system_info": GetGroupFileSystemInfo,
-	"get_group_root_files":       GetGroupRootFiles,
-	"get_group_files_by_folder":  GetGroupFilesByFolderId,
-	"get_group_file_url":         GetGroupFileUrl,
-	"send_msg":                   SendMessage,
-	"send_group_msg":             SendGroupMessage,
-	"send_group_forward_msg":     SendGroupForwardMessage,
-	"send_private_msg":           SendPrivateMessage,
-	"delete_msg":                 DeleteMessage,
-	"set_friend_add_request":     ProcessFriendRequest,
-	"set_group_add_request":      ProcessGroupRequest,
-	"set_group_card":             SetGroupCard,
-	"set_group_special_title":    SetSpecialTitle,
-	"set_group_kick":             SetGroupKick,
-	"set_group_ban":              SetGroupBan,
-	"set_group_whole_ban":        SetWholeBan,
-	"set_group_name":             SetGroupName,
-	"set_group_admin":            SetGroupAdmin,
-	"_send_group_notice":         SendGroupNotice,
-	"set_group_leave":            SetGroupLeave,
-	"get_image":                  GetImage,
-	"get_forward_msg":            GetForwardMessage,
-	"get_msg":                    GetMessage,
-	"get_group_system_msg":       GetGroupSystemMessage,
-	"get_group_honor_info":       GetGroupHonorInfo,
-	"can_send_image":             CanSendImage,
-	"can_send_record":            CanSendRecord,
-	"get_status":                 GetStatus,
-	"get_version_info":           GetVersionInfo,
-	"_get_vip_info":              GetVipInfo,
-	"get_stranger_info":          GetStrangerInfo,
-	"reload_event_filter":        ReloadEventFilter,
-	"set_group_portrait":         SetGroupPortrait,
-	".handle_quick_operation":    HandleQuickOperation,
-	".ocr_image":                 OcrImage,
-	".get_word_slices":           GetWordSlices,
 }
 
 func (s *httpServer) ShutDown() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	if err := s.Http.Shutdown(ctx); err != nil {
+	if err := s.HTTP.Shutdown(ctx); err != nil {
 		log.Fatal("http Server Shutdown:", err)
 	}
-	select {
+	<-ctx.Done()
-	case <-ctx.Done():
+	log.Println("timeout of 5 seconds.")
-		log.Println("timeout of 5 seconds.")
-	}
 	log.Println("http Server exiting")
 }

server/middlewares.go

@@ -0,0 +1,112 @@
+package server
+
+import (
+	"container/list"
+	"context"
+	"os"
+	"sync"
+	"time"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	"golang.org/x/time/rate"
+)
+
+var (
+	filters     = make(map[string]global.Filter)
+	filterMutex sync.RWMutex
+)
+
+func rateLimit(frequency float64, bucketSize int) handler {
+	limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
+	return func(_ string, _ resultGetter) 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 {
+	var mutex sync.Mutex
+	cond := sync.NewCond(&mutex)
+	queue := list.New()
+	bot.OnEventPush(func(event *coolq.Event) {
+		mutex.Lock()
+		defer mutex.Unlock()
+		queue.PushBack(event.RawMsg)
+		for maxSize != 0 && queue.Len() > maxSize {
+			queue.Remove(queue.Front())
+		}
+		cond.Signal()
+	})
+	return func(action string, p resultGetter) global.MSG {
+		if action != "get_updates" {
+			return nil
+		}
+		var (
+			once    sync.Once
+			ch      = make(chan []interface{}, 1)
+			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
+		)
+		defer close(ch)
+		go func() {
+			mutex.Lock()
+			defer mutex.Unlock()
+			if queue.Len() == 0 {
+				cond.Wait()
+			}
+			once.Do(func() {
+				limit := int(p.Get("limit").Int())
+				if limit <= 0 || queue.Len() < limit {
+					limit = queue.Len()
+				}
+				ret := make([]interface{}, limit)
+				for i := 0; i < limit; i++ {
+					ret[i] = queue.Remove(queue.Front())
+				}
+				ch <- ret
+			})
+		}()
+		if timeout != 0 {
+			select {
+			case <-time.After(timeout):
+				once.Do(func() {})
+				return coolq.OK([]interface{}{})
+			case ret := <-ch:
+				return coolq.OK(ret)
+			}
+		}
+		return coolq.OK(<-ch)
+	}
+}

server/pprof.go

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

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

server/websocket.go

@@ -1,531 +1,382 @@
 package server
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"gopkg.in/yaml.v3"
+	"nhooyr.io/websocket"
+
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/gorilla/websocket"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
+
+	"github.com/Mrs4s/MiraiGo/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
-type websocketServer struct {
+type webSocketServer struct {
-	bot            *coolq.CQBot
+	bot  *coolq.CQBot
-	token          string
+	conf *config.WebsocketServer
-	eventConn      []*websocketConn
+
-	eventConnMutex sync.Mutex
+	mu        sync.Mutex
-	handshake      string
+	eventConn []*wsConn
+
+	token     string
+	handshake string
+	filter    string
 }
 
+// websocketClient WebSocket客户端实例
 type websocketClient struct {
-	conf  *global.GoCQReverseWebsocketConfig
+	bot  *coolq.CQBot
-	token string
+	conf *config.WebsocketReverse
-	bot   *coolq.CQBot
 
-	universalConn *websocketConn
+	mu sync.Mutex
-	eventConn     *websocketConn
+
+	universal *wsConn
+	event     *wsConn
+	token     string
+	filter    string
 }
 
-type websocketConn struct {
+type wsConn struct {
 	*websocket.Conn
-	sync.Mutex
+	apiCaller *apiCaller
 }
 
-var WebsocketServer = &websocketServer{}
+// runWSServer 运行一个正向WS server
-var upgrader = websocket.Upgrader{
+func runWSServer(b *coolq.CQBot, node yaml.Node) {
-	CheckOrigin: func(r *http.Request) bool {
+	var conf config.WebsocketServer
-		return true
+	switch err := node.Decode(&conf); {
-	},
+	case err != nil:
-}
+		log.Warn("读取正向Websocket配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
+		return
+	}
 
-func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
+	s := &webSocketServer{
-	s.token = authToken
+		bot:    b,
-	s.bot = b
+		conf:   &conf,
+		token:  conf.AccessToken,
+		filter: conf.Filter,
+	}
+	addFilter(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}`,
-		s.bot.Client.Uin, time.Now().Unix())
+		b.Client.Uin, time.Now().Unix())
 	b.OnEventPush(s.onBotPushEvent)
-	http.HandleFunc("/event", s.event)
+	mux := http.ServeMux{}
-	http.HandleFunc("/api", s.api)
+	mux.HandleFunc("/event", s.event)
-	http.HandleFunc("/", s.any)
+	mux.HandleFunc("/api", s.api)
+	mux.HandleFunc("/", s.any)
 	go func() {
-		log.Infof("CQ Websocket 服务器已启动: %v", addr)
+		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-		log.Fatal(http.ListenAndServe(addr, nil))
+		log.Fatal(http.ListenAndServe(addr, &mux))
 	}()
 }
 
-func NewWebsocketClient(conf *global.GoCQReverseWebsocketConfig, authToken string, b *coolq.CQBot) *websocketClient {
+// runWSClient 运行一个反向向WS client
-	return &websocketClient{conf: conf, token: authToken, bot: b}
+func runWSClient(b *coolq.CQBot, node yaml.Node) {
-}
+	var conf config.WebsocketReverse
-
+	switch err := node.Decode(&conf); {
-func (c *websocketClient) Run() {
+	case err != nil:
-	if !c.conf.Enabled {
+		log.Warn("读取反向Websocket配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
 		return
 	}
-	if c.conf.ReverseUrl != "" {
+
-		c.connectUniversal()
+	c := &websocketClient{
+		bot:    b,
+		conf:   &conf,
+		token:  conf.AccessToken,
+		filter: conf.Filter,
+	}
+	addFilter(c.filter)
+	if c.conf.Universal != "" {
+		c.connect("Universal", conf.Universal, &c.universal)
 	} else {
-		if c.conf.ReverseApiUrl != "" {
+		if c.conf.API != "" {
-			c.connectApi()
+			c.connect("API", conf.API, nil)
 		}
-		if c.conf.ReverseEventUrl != "" {
+		if c.conf.Event != "" {
-			c.connectEvent()
+			c.connect("Event", conf.Event, &c.event)
 		}
 	}
 	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connectApi() {
+func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
-	log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseApiUrl)
+	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, c.conf.API)
 	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.ReverseApiUrl, header)
+	conn, _, err := websocket.Dial(context.Background(), url, &websocket.DialOptions{HTTPHeader: header}) // nolint
 	if err != nil {
-		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err)
+		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, c.conf.API, err)
-		if c.conf.ReverseReconnectInterval != 0 {
+		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectApi()
+			c.connect(typ, url, conptr)
-		}
-		return
-	}
-	log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseApiUrl)
-	wrappedConn := &websocketConn{Conn: conn}
-	go c.listenApi(wrappedConn, false)
-}
-
-func (c *websocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventUrl)
-	header := http.Header{
-		"X-Client-Role": []string{"Event"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
-	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventUrl, header)
-	if err != nil {
-		log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventUrl, err)
-		if c.conf.ReverseReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-			c.connectEvent()
 		}
 		return
 	}
 
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
+	switch typ {
-		c.bot.Client.Uin, time.Now().Unix())
+	case "Event", "Universal":
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+		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())
-	if err != nil {
+		err = conn.Write(context.Background(), websocket.MessageText, []byte(handshake))
-		log.Warnf("反向Websocket 握手时出现错误: %v", err)
+		if err != nil {
-	}
+			log.Warnf("反向WebSocket 握手时出现错误: %v", err)
-
-	log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventUrl)
-	c.eventConn = &websocketConn{Conn: conn}
-}
-
-func (c *websocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseUrl)
-	header := http.Header{
-		"X-Client-Role": []string{"Universal"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
-	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseUrl, header)
-	if err != nil {
-		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseUrl, err)
-		if c.conf.ReverseReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-			c.connectUniversal()
 		}
-		return
 	}
 
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
+	log.Infof("已连接到反向WebSocket %s服务器 %v", typ, c.conf.API)
-		c.bot.Client.Uin, time.Now().Unix())
+	wrappedConn := &wsConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+	if c.conf.RateLimit.Enabled {
-	if err != nil {
+		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-		log.Warnf("反向Websocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &websocketConn{Conn: conn}
+	if conptr != nil {
-	go c.listenApi(wrappedConn, true)
+		*conptr = wrappedConn
-	c.universalConn = wrappedConn
+	}
+
+	switch typ {
+	case "API":
+		go c.listenAPI(wrappedConn, false)
+	case "Universal":
+		go c.listenAPI(wrappedConn, true)
+	}
 }
 
-func (c *websocketClient) listenApi(conn *websocketConn, u bool) {
+func (c *websocketClient) listenAPI(conn *wsConn, u bool) {
-	defer conn.Close()
+	defer func() { _ = conn.Close(websocket.StatusNormalClosure, "") }()
 	for {
-		_, buf, err := conn.ReadMessage()
+		buffer := global.NewBuffer()
+		t, reader, err := conn.Conn.Reader(context.Background())
 		if err != nil {
 			log.Warnf("监听反向WS API时出现错误: %v", err)
 			break
 		}
-
+		_, err = buffer.ReadFrom(reader)
-		go conn.handleRequest(c.bot, buf)
+		if err != nil {
-
+			log.Warnf("监听反向WS API时出现错误: %v", err)
+			break
+		}
+		if t == websocket.MessageText {
+			go func(buffer *bytes.Buffer) {
+				defer global.PutBuffer(buffer)
+				conn.handleRequest(c.bot, buffer.Bytes())
+			}(buffer)
+		} else {
+			global.PutBuffer(buffer)
+		}
 	}
-	if c.conf.ReverseReconnectInterval != 0 {
+	if c.conf.ReconnectInterval != 0 {
-		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+		time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
 		if !u {
-			go c.connectApi()
+			go c.connect("API", c.conf.API, nil)
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
+func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
-	if c.eventConn != nil {
+	filter := findFilter(c.filter)
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson())
+	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-		conn := c.eventConn
+		log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
-		conn.Lock()
+		return
-		defer conn.Unlock()
+	}
-		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+	push := func(conn *wsConn, reconnect func()) {
-		if err := c.eventConn.WriteJSON(m); err != nil {
+		log.Debugf("向WS服务器推送Event: %s", e.JSONBytes())
-			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
-			_ = c.eventConn.Close()
+		defer cancel()
-			if c.conf.ReverseReconnectInterval != 0 {
+		if err := conn.Write(ctx, websocket.MessageText, e.JSONBytes()); err != nil {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+			log.Warnf("向WS服务器推送 Event 时出现错误: %v", err)
-				c.connectEvent()
+			_ = conn.Close(websocket.StatusNormalClosure, "")
+			if c.conf.ReconnectInterval != 0 {
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+				reconnect()
 			}
 		}
 	}
-	if c.universalConn != nil {
+
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson())
+	connect := func(typ, url string, conptr **wsConn) func() {
-		conn := c.universalConn
+		return func() {
-		conn.Lock()
+			c.connect(typ, url, conptr)
-		defer conn.Unlock()
-		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := c.universalConn.WriteJSON(m); err != nil {
-			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
-			_ = c.universalConn.Close()
-			if c.conf.ReverseReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-				c.connectUniversal()
-			}
 		}
 	}
+
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	if c.event != nil {
+		push(c.event, connect("Event", c.conf.Event, &c.event))
+	}
+	if c.universal != nil {
+		push(c.universal, connect("Universal", c.conf.Universal, &c.universal))
+	}
 }
 
-func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
+func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
-	if s.token != "" {
+	status := checkAuth(r, s.token)
-		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+	if status != http.StatusOK {
-			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+		w.WriteHeader(status)
-				w.WriteHeader(401)
-				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))
+	c, err := websocket.Accept(w, r, nil)
 	if err != nil {
-		log.Warnf("Websocket 握手时出现错误: %v", err)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
-		c.Close()
+		return
+	}
+	err = c.Write(context.Background(), websocket.MessageText, []byte(s.handshake))
+	if err != nil {
+		log.Warnf("WebSocket 握手时出现错误: %v", err)
+		_ = c.Close(websocket.StatusNormalClosure, "")
 		return
 	}
 
-	log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr)
+	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &websocketConn{Conn: c}
+	conn := &wsConn{Conn: c, apiCaller: newAPICaller(s.bot)}
 
-	s.eventConnMutex.Lock()
+	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) {
+func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
-	if s.token != "" {
+	status := checkAuth(r, s.token)
-		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+	if status != http.StatusOK {
-			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+		w.WriteHeader(status)
-				w.WriteHeader(401)
-				return
-			}
-		}
-	}
-	c, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
 		return
 	}
-	log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr)
+	c, err := websocket.Accept(w, r, nil)
-	conn := &websocketConn{Conn: c}
+	if err != nil {
-	go s.listenApi(conn)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
+		return
+	}
+	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
+	conn := &wsConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	if s.conf.RateLimit.Enabled {
+		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+	}
+	go s.listenAPI(conn)
 }
 
-func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
+func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
-	if s.token != "" {
+	status := checkAuth(r, s.token)
-		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+	if status != http.StatusOK {
-			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+		w.WriteHeader(status)
-				w.WriteHeader(401)
-				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))
+	c, err := websocket.Accept(w, r, nil)
 	if err != nil {
-		log.Warnf("Websocket 握手时出现错误: %v", err)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
-		c.Close()
 		return
 	}
-	log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
+	err = c.Write(context.Background(), websocket.MessageText, []byte(s.handshake))
-	conn := &websocketConn{Conn: c}
+	if err != nil {
+		log.Warnf("WebSocket 握手时出现错误: %v", err)
+		_ = c.Close(websocket.StatusNormalClosure, "")
+		return
+	}
+	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
+	conn := &wsConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	if s.conf.RateLimit.Enabled {
+		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+	}
+	s.mu.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.listenApi(conn)
+	s.mu.Unlock()
+	s.listenAPI(conn)
 }
 
-func (s *websocketServer) listenApi(c *websocketConn) {
+func (s *webSocketServer) listenAPI(c *wsConn) {
-	defer c.Close()
+	defer func() { _ = c.Close(websocket.StatusNormalClosure, "") }()
 	for {
-		t, payload, err := c.ReadMessage()
+		buffer := global.NewBuffer()
+		t, reader, err := c.Reader(context.Background())
+		if err != nil {
+			break
+		}
+		_, err = buffer.ReadFrom(reader)
 		if err != nil {
 			break
 		}
 
-		if t == websocket.TextMessage {
+		if t == websocket.MessageText {
-			go c.handleRequest(s.bot, payload)
+			go func(buffer *bytes.Buffer) {
+				defer global.PutBuffer(buffer)
+				c.handleRequest(s.bot, buffer.Bytes())
+			}(buffer)
+		} else {
+			global.PutBuffer(buffer)
 		}
 	}
 }
 
-func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
+func (c *wsConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Printf("处置WS命令时发生无法恢复的异常：%v", err)
+			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
-			c.Close()
+			_ = c.Close(websocket.StatusInternalError, fmt.Sprint(err))
 		}
 	}()
-	global.RateLimit(context.Background())
+	j := gjson.Parse(utils.B2S(payload))
-	j := gjson.ParseBytes(payload)
+	t := strings.TrimSuffix(j.Get("action").Str, "_async")
-	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	if f, ok := wsApi[t]; ok {
+	ret := c.apiCaller.callAPI(t, j.Get("params"))
-		ret := f(bot, j.Get("params"))
+	if j.Get("echo").Exists() {
-		if j.Get("echo").Exists() {
+		ret["echo"] = j.Get("echo").Value()
-			ret["echo"] = j.Get("echo").Value()
-		}
-		c.Lock()
-		defer c.Unlock()
-		_ = c.WriteJSON(ret)
 	}
+	writer, _ := c.Writer(context.Background(), websocket.MessageText)
+	_ = json.NewEncoder(writer).Encode(ret)
+	_ = writer.Close()
 }
 
-func (s *websocketServer) onBotPushEvent(m coolq.MSG) {
+func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
-	s.eventConnMutex.Lock()
+	filter := findFilter(s.filter)
-	defer s.eventConnMutex.Unlock()
+	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-	for i, l := 0, len(s.eventConn); i < l; i++ {
+		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: %v", conn.RemoteAddr().String(), m.ToJson())
+		log.Debugf("向WS客户端推送Event: %s", e.JSONBytes())
-		conn.Lock()
+		if err := conn.Write(context.Background(), websocket.MessageText, e.JSONBytes()); err != nil {
-		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson())); err != nil {
+			_ = conn.Close(websocket.StatusNormalClosure, "")
-			_ = conn.Close()
-			next := i + 1
-			if next >= l {
-				next = l - 1
-			}
-			s.eventConn[i], s.eventConn[next] = s.eventConn[next], s.eventConn[i]
-			s.eventConn = append(s.eventConn[:next], s.eventConn[next+1:]...)
-			i--
-			l--
 			conn = nil
 			continue
 		}
-		conn.Unlock()
+		if i != j {
+			// i != j means that some connection has been closed.
+			// use a in-place removal to avoid copying.
+			s.eventConn[j] = conn
+		}
+		j++
 	}
-}
+	s.eventConn = s.eventConn[:j]
-
-var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
-	"get_login_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetLoginInfo()
-	},
-	"get_friend_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetFriendList()
-	},
-	"get_group_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupList(p.Get("no_cache").Bool())
-	},
-	"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupInfo(p.Get("group_id").Int())
-	},
-	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-	},
-	"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberInfo(
-			p.Get("group_id").Int(), p.Get("user_id").Int(),
-		)
-	},
-	"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
-		if p.Get("message_type").Str == "private" {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("message_type").Str == "group" {
-			return bot.CQSendGroupMessage(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)
-		}
-		if p.Get("user_id").Int() != 0 {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		return coolq.MSG{}
-	},
-	"send_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"send_group_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
-	},
-	"send_private_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"delete_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
-	},
-	"set_friend_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		apr := true
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
-	},
-	"set_group_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		subType := p.Get("sub_type").Str
-		apr := true
-		if subType == "" {
-			subType = p.Get("type").Str
-		}
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
-	},
-	"set_group_card": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
-	},
-	"set_group_special_title": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
-	},
-	"set_group_kick": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str)
-	},
-	"set_group_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
-			if p.Get("duration").Exists() {
-				return uint32(p.Get("duration").Int())
-			}
-			return 1800
-		}())
-	},
-	"set_group_whole_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
-			if p.Get("enable").Exists() {
-				return p.Get("enable").Bool()
-			}
-			return true
-		}())
-	},
-	"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
-	},
-	"set_group_admin": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
-			if p.Get("enable").Exists() {
-				return p.Get("enable").Bool()
-			}
-			return true
-		}())
-	},
-	"_send_group_notice": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
-	},
-	"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupLeave(p.Get("group_id").Int())
-	},
-	"get_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetImage(p.Get("file").Str)
-	},
-	"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetForwardMessage(p.Get("message_id").Str)
-	},
-	"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetMessage(int32(p.Get("message_id").Int()))
-	},
-	"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
-	},
-	"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCanSendImage()
-	},
-	"can_send_record": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCanSendRecord()
-	},
-	"get_stranger_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetStrangerInfo(p.Get("user_id").Int())
-	},
-	"get_status": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetStatus()
-	},
-	"get_version_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetVersionInfo()
-	},
-	"get_group_system_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupSystemMessages()
-	},
-	"get_group_file_system_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
-	},
-	"get_group_root_files": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
-	},
-	"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFilesByFolderId(p.Get("group_id").Int(), p.Get("folder_id").Str)
-	},
-	"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileUrl(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
-	},
-	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetVipInfo(p.Get("user_id").Int())
-	},
-	"reload_event_filter": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQReloadEventFilter()
-	},
-	".ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQOcrImage(p.Get("image").Str)
-	},
-	".get_word_slices": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetWordSlices(p.Get("content").Str)
-	},
-	"set_group_portrait": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
-	},
-	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
-	},
 }