Merge pull request #802 from finpluto/master

chore(dep): Upgrade go from 1.15.5 to 1.16 in dockerfile.

.github/ISSUE_TEMPLATE/bug--.md

@@ -1,13 +1,16 @@
 ---
 name: Bug汇报
-about: 遇到了bug? 你可以在这里开始汇报
+about: 遇到了bug? 你可以在这里开始汇报（仅限软件本体问题）
 title: ''
-labels: ''
+labels: bug?
 assignees: ''
 
 ---
 
 <!--
+
+！请不要删除此处内容！
+
 在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
 
 1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
@@ -28,7 +31,7 @@ assignees: ''
 -->
 
 **环境信息**
-<!-- 请根据实际使用环境修改以下信息。请勿留空。 -->
+<!-- 请根据实际使用环境修改以下信息。请勿删除或留空。 -->
 go-cqhttp版本: 
 运行环境: 
 连接方式: 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 提出新建议/功能
+  - name: 不知道怎么做?
-    url: https://github.com/Mrs4s/go-cqhttp/discussions/new
+    url: https://github.com/Mrs4s/go-cqhttp/issues/633
-    about: 请在这里提出你的建议或功能
+    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

@@ -48,13 +48,3 @@ jobs:
         with:
           name: ${{ matrix.goos }}_${{ matrix.goarch }}
           path: output/
-
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: v1.29

.github/workflows/golint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [push]
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+
+      - name: Commit back
+        if: github.repository_owner == 'Mrs4s'
+        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

.github/workflows/issuebot.yml

@@ -2,7 +2,7 @@ name: Issuebot
 
 on:
   issues:
-    types: [opened]
+    types: [opened, edited]
 
 jobs:
   new_issue:

.github/workflows/release.yml

@@ -1,36 +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, darwin/arm64
-        goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm, arm64]
-        exclude: 
-          - goos: darwin
-            goarch: arm
-          - goos: darwin
-            goarch: "386"
-          - goos: windows
-            goarch: arm64
-            
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
-      - name: Set RELEASE_VERSION env
+        uses: actions/checkout@v2.3.4
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-      - 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 }}
-          goversion: "https://golang.org/dl/go1.16.linux-amd64.tar.gz"
-          build_flags: -trimpath
-          ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
 
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.2'
+
+      - 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

.github/workflows/suggester.yml

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

.gitignore

@@ -1,7 +1,9 @@
 vendor/
 .idea
+.vscode
 config.hjson
+config.yml
+session.token
 device.json
-codec/
 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
+    - gofumpt
+    - goimports
+    - goprintffuncname
+    #- gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - nolintlint
+    - rowserrcheck
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - varcheck
+    - whitespace
+    - prealloc
+    - predeclared
+    - asciicheck
+    - golint
+    - 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,87 @@
+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/coolq.Version=v{{.Version}}
+  - id: win
+    env:
+      - CGO_ENABLED=0
+      - GO111MODULE=on
+    goos:
+      - windows
+    goarch:
+      - 386
+      - amd64
+      - arm
+    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,4 +1,4 @@
-FROM golang:1.15.5-alpine AS builder
+FROM golang:1.16-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \

README.md

@@ -18,6 +18,7 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
   <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>
@@ -35,8 +36,11 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
   <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的文档
 

coolq/api.go

@@ -4,27 +4,41 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/tidwall/gjson"
 	"io/ioutil"
 	"math"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/MiraiGo/utils"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 
 	"github.com/Mrs4s/go-cqhttp/global"
-	log "github.com/sirupsen/logrus"
 )
 
 // Version go-cqhttp的版本信息，在编译时使用ldflags进行覆盖
 var Version = "unknown"
 
+func init() {
+	if Version != "unknown" {
+		return
+	}
+	info, ok := debug.ReadBuildInfo()
+	if ok {
+		Version = info.Main.Version
+	}
+}
+
 // CQGetLoginInfo 获取登录号信息
 //
 // https://git.io/Jtz1I
@@ -36,7 +50,7 @@ func (bot *CQBot) CQGetLoginInfo() MSG {
 //
 // https://git.io/Jtz1L
 func (bot *CQBot) CQGetFriendList() MSG {
-	fs := make([]MSG, 0)
+	fs := make([]MSG, 0, len(bot.Client.FriendList))
 	for _, f := range bot.Client.FriendList {
 		fs = append(fs, MSG{
 			"nickname": f.Nickname,
@@ -51,16 +65,19 @@ func (bot *CQBot) CQGetFriendList() MSG {
 //
 // https://git.io/Jtz1t
 func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
-	gs := make([]MSG, 0)
+	gs := make([]MSG, 0, len(bot.Client.GroupList))
 	if noCache {
 		_ = bot.Client.ReloadGroupList()
 	}
 	for _, g := range bot.Client.GroupList {
 		gs = append(gs, MSG{
-			"group_id":         g.Code,
+			"group_id":          g.Code,
-			"group_name":       g.Name,
+			"group_name":        g.Name,
-			"max_member_count": g.MaxMemberCount,
+			"group_memo":        g.Memo,
-			"member_count":     g.MemberCount,
+			"group_create_time": g.GroupCreateTime,
+			"group_level":       g.GroupLevel,
+			"max_member_count":  g.MaxMemberCount,
+			"member_count":      g.MemberCount,
 		})
 	}
 	return OK(gs)
@@ -71,6 +88,9 @@ func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
 // https://git.io/Jtz1O
 func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupID)
+	if group == nil || noCache {
+		group, _ = bot.Client.GetGroupInfo(groupID)
+	}
 	if group == nil {
 		gid := strconv.FormatInt(groupID, 10)
 		info, err := bot.Client.SearchGroupByKeyword(gid)
@@ -80,28 +100,28 @@ func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) MSG {
 		for _, g := range info {
 			if g.Code == groupID {
 				return OK(MSG{
-					"group_id":         g.Code,
+					"group_id":          g.Code,
-					"group_name":       g.Name,
+					"group_name":        g.Name,
-					"max_member_count": 0,
+					"group_memo":        g.Memo,
-					"member_count":     0,
+					"group_create_time": 0,
+					"group_level":       0,
+					"max_member_count":  0,
+					"member_count":      0,
 				})
 			}
 		}
-		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在失败")
+	} else {
+		return OK(MSG{
+			"group_id":          group.Code,
+			"group_name":        group.Name,
+			"group_memo":        group.Memo,
+			"group_create_time": group.GroupCreateTime,
+			"group_level":       group.GroupLevel,
+			"max_member_count":  group.MaxMemberCount,
+			"member_count":      group.MemberCount,
+		})
 	}
-	if noCache {
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
-		var err error
-		group, err = bot.Client.GetGroupInfo(groupID)
-		if err != nil {
-			return Failed(100, "GET_GROUP_INFO_API_ERROR", err.Error())
-		}
-	}
-	return OK(MSG{
-		"group_id":         group.Code,
-		"group_name":       group.Name,
-		"max_member_count": group.MaxMemberCount,
-		"member_count":     group.MemberCount,
-	})
 }
 
 // CQGetGroupMemberList 获取群成员列表
@@ -120,7 +140,7 @@ func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) MSG {
 		}
 		group.Members = t
 	}
-	members := make([]MSG, 0)
+	members := make([]MSG, 0, len(group.Members))
 	for _, m := range group.Members {
 		members = append(members, convertGroupMemberInfo(groupID, m))
 	}
@@ -130,12 +150,22 @@ func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) MSG {
 // CQGetGroupMemberInfo 获取群成员信息
 //
 // https://git.io/Jtz1s
-func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64) MSG {
+func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
 		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
-	member := group.FindMember(userID)
+	var member *client.GroupMemberInfo
+	if noCache {
+		var err error
+		member, err = bot.Client.GetMemberInfo(groupID, userID)
+		if err != nil {
+			log.Warnf("刷新群 %v 中成员 %v 失败: %v", groupID, userID, err)
+			return Failed(100, "GET_MEMBER_INFO_API_ERROR", err.Error())
+		}
+	} else {
+		member = group.FindMember(userID)
+	}
 	if member == nil {
 		return Failed(100, "MEMBER_NOT_FOUND", "群员不存在")
 	}
@@ -274,7 +304,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, i interface{}, autoEscape bo
 			if mid == -1 {
 				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
-			log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
+			log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(ToStringMessage(elem, int64(mid))), mid)
 			return OK(MSG{"message_id": mid})
 		}
 		str = func() string {
@@ -301,7 +331,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, i interface{}, autoEscape bo
 	if mid == -1 {
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
-	log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupID, groupID, limitedString(str), mid)
+	log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(str), mid)
 	return OK(MSG{"message_id": mid})
 }
 
@@ -438,12 +468,12 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 // CQSendPrivateMessage 发送私聊消息
 //
 // https://git.io/Jtz1l
-func (bot *CQBot) CQSendPrivateMessage(userID int64, groupId int64, i interface{}, autoEscape bool) MSG {
+func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, i interface{}, autoEscape bool) MSG {
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
 			elem := bot.ConvertObjectMessage(m, false)
-			mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
+			mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
@@ -468,7 +498,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupId int64, i interface{
 	} else {
 		elem = bot.ConvertStringMessage(str, false)
 	}
-	mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
+	mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
@@ -830,12 +860,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 
 		if reply.Exists() {
 			autoEscape := global.EnsureBool(operation.Get("auto_escape"), false)
-
+			at := operation.Get("at_sender").Bool() && !isAnonymous && msgType == "group"
-			at := !isAnonymous && msgType == "group" // 除匿名消息场合外默认 true
-			if operation.Get("at_sender").Exists() {
-				at = operation.Get("at_sender").Bool() && !isAnonymous && msgType == "group"
-			}
-
 			if at && reply.IsArray() {
 				// 在 reply 数组头部插入CQ码
 				replySegments := make([]MSG, 0)
@@ -967,7 +992,7 @@ func (bot *CQBot) CQGetForwardMessage(resID string) MSG {
 	if m == nil {
 		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
 	}
-	r := make([]MSG, 0)
+	r := make([]MSG, 0, len(m.Nodes))
 	for _, n := range m.Nodes {
 		bot.checkMedia(n.Message)
 		r = append(r, MSG{
@@ -1053,7 +1078,7 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) MSG {
 		log.Warnf("获取群历史消息失败: %v", err)
 		return Failed(100, "MESSAGES_API_ERROR", err.Error())
 	}
-	var ms []MSG
+	ms := make([]MSG, 0, len(msg))
 	for _, m := range msg {
 		id := m.Id
 		bot.checkMedia(m.Elements)
@@ -1079,7 +1104,7 @@ func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
 			return Failed(100, "REFRESH_STATUS_ERROR", err.Error())
 		}
 	}
-	var d []MSG
+	d := make([]MSG, 0, len(bot.Client.OnlineClients))
 	for _, oc := range bot.Client.OnlineClients {
 		d = append(d, MSG{
 			"app_id":      oc.AppId,
@@ -1123,14 +1148,6 @@ func (bot *CQBot) CQOcrImage(imageID string) MSG {
 	return OK(rsp)
 }
 
-// CQReloadEventFilter 扩展API-重载事件过滤器
-//
-// https://docs.go-cqhttp.org/api/#%E9%87%8D%E8%BD%BD%E4%BA%8B%E4%BB%B6%E8%BF%87%E6%BB%A4%E5%99%A8
-func (bot *CQBot) CQReloadEventFilter() MSG {
-	global.BootFilter()
-	return OK(nil)
-}
-
 // CQSetGroupPortrait 扩展API-设置群头像
 //
 // https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
@@ -1237,9 +1254,9 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG {
 	if err != nil {
 		return Failed(100, "GET_ESSENCE_LIST_FOUND", err.Error())
 	}
-	list := make([]MSG, 0)
+	list := make([]MSG, 0, len(msgList))
 	for _, m := range msgList {
-		var msg = MSG{
+		msg := MSG{
 			"sender_nick":   m.SenderNick,
 			"sender_time":   m.SenderTime,
 			"operator_time": m.AddDigestTime,
@@ -1342,6 +1359,8 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
 				return "owner"
 			case client.Administrator:
 				return "admin"
+			case client.Member:
+				return "member"
 			default:
 				return "member"
 			}
@@ -1354,10 +1373,15 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
 }
 
 func limitedString(str string) string {
-	if strings.Count(str, "") <= 10 {
+	if utf8.RuneCountInString(str) <= 10 {
 		return str
 	}
-	limited := []rune(str)
+	b := utils.S2B(str)
-	limited = limited[:10]
+	limited := make([]rune, 0, 10)
+	for i := 0; i < 10; i++ {
+		decodeRune, size := utf8.DecodeRune(b)
+		b = b[size:]
+		limited = append(limited, decodeRune)
+	}
 	return string(limited) + " ..."
 }

coolq/bot.go

@@ -13,11 +13,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/config"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/Mrs4s/go-cqhttp/global"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/syndtr/goleveldb/leveldb"
@@ -29,11 +31,11 @@ var json = jsoniter.ConfigCompatibleWithStandardLibrary
 type CQBot struct {
 	Client *client.QQClient
 
-	events         []func(MSG)
+	events           []func(*bytes.Buffer)
-	db             *leveldb.DB
+	db               *leveldb.DB
-	friendReqCache sync.Map
+	friendReqCache   sync.Map
-	tempMsgCache   sync.Map
+	tempSessionCache sync.Map
-	oneWayMsgCache sync.Map
+	oneWayMsgCache   sync.Map
 }
 
 // MSG 消息Map
@@ -43,11 +45,18 @@ type MSG map[string]interface{}
 var ForceFragmented = false
 
 // NewQQBot 初始化一个QQBot实例
-func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
+func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
-	if conf.EnableDB {
+	enableLevelDB := false
+	node, ok := conf.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)
 		if err != nil {
@@ -61,7 +70,8 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	if conf.EnableSelfMessage {
+	if conf.Message.ReportSelfMessage {
+		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
@@ -84,16 +94,17 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		i := conf.HeartbeatInterval
+		i := conf.Heartbeat.Interval
-		if i < 0 {
+		if i < 0 || conf.Heartbeat.Disabled {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
 		if i == 0 {
 			i = 5
 		}
+		t := time.NewTicker(time.Second * time.Duration(i))
 		for {
-			time.Sleep(time.Second * i)
+			<-t.C
 			bot.dispatchEventMessage(MSG{
 				"time":            time.Now().Unix(),
 				"self_id":         bot.Client.Uin,
@@ -108,7 +119,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 }
 
 // OnEventPush 注册事件上报函数
-func (bot *CQBot) OnEventPush(f func(m MSG)) {
+func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
 	bot.events = append(bot.events, f)
 }
 
@@ -118,7 +129,8 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 		m := MSG{}
 		data, err := bot.db.Get(binary.ToBytes(mid), nil)
 		if err == nil {
-			buff := new(bytes.Buffer)
+			buff := global.NewBuffer()
+			defer global.PutBuffer(buff)
 			buff.Write(binary.GZipUncompress(data))
 			err = gob.NewDecoder(buff).Decode(&m)
 			if err == nil {
@@ -147,7 +159,7 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
 		}
 		defer video.Close()
 		hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
-		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
+		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)
@@ -171,7 +183,7 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement
 
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
-	var newElem []message.IMessageElement
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
@@ -242,8 +254,8 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 }
 
 // SendPrivateMessage 发送私聊消息
-func (bot *CQBot) SendPrivateMessage(target int64, groupId int64, m *message.SendingMessage) int32 {
+func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
-	var newElem []message.IMessageElement
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
 			fm, err := bot.UploadLocalImageAsPrivate(target, i)
@@ -294,18 +306,24 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupId int64, m *message.Sen
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	} else if code, ok := bot.tempMsgCache.Load(target); ok || groupId != 0 { // 临时会话
+	} else if session, ok := bot.tempSessionCache.Load(target); ok || groupID != 0 { // 临时会话
-		if groupId != 0 && !bot.Client.FindGroup(groupId).AdministratorOrOwner() {
+		switch {
-			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupId)
+		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
-			id = -1
+			log.Errorf("错误: 找不到群(%v)", groupID)
-		} else if groupId != 0 && bot.Client.FindGroup(groupId).FindMember(target) == nil {
+		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
-			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupId)
+			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
-			id = -1
+		case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
-		} else {
+			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
-			if code != nil {
+		default:
-				groupId = code.(int64)
+			if session == nil && groupID != 0 {
+				bot.Client.SendGroupTempMessage(groupID, target, m)
+				break
+			}
+			msg, err := session.(*client.TempSessionInfo).SendMessage(m)
+			if err != nil {
+				log.Errorf("发送临时会话消息失败: %v", err)
+				break
 			}
-			msg := bot.Client.SendTempMessage(groupId, target, m)
 			if msg != nil {
 				id = bot.InsertTempMessage(target, msg)
 			}
@@ -341,7 +359,8 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	}
 	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
@@ -366,7 +385,8 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	}
 	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
@@ -393,7 +413,8 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 	}
 	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
@@ -419,25 +440,29 @@ func (bot *CQBot) Release() {
 }
 
 func (bot *CQBot) dispatchEventMessage(m MSG) {
-	if global.EventFilter != nil && !global.EventFilter.Eval(global.MSG(m)) {
+	buf := global.NewBuffer()
-		log.Debug("Event filtered!")
+	wg := sync.WaitGroup{}
-		return
+	wg.Add(len(bot.events))
-	}
+	_ = json.NewEncoder(buf).Encode(m)
 	for _, f := range bot.events {
-		go func(fn func(MSG)) {
+		go func(fn func(*bytes.Buffer)) {
 			defer func() {
+				wg.Done()
 				if pan := recover(); pan != nil {
 					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
 				}
 			}()
+
 			start := time.Now()
-			fn(m)
+			fn(buf)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
 			}
 		}(f)
 	}
+	wg.Wait()
+	global.PutBuffer(buf)
 }
 
 func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
@@ -499,6 +524,8 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 				return "owner"
 			case client.Administrator:
 				return "admin"
+			case client.Member:
+				return "member"
 			default:
 				return "member"
 			}

coolq/cqcode.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/base64"
-	goBinary "encoding/binary"
 	"encoding/hex"
 	xml2 "encoding/xml"
 	"errors"
@@ -25,9 +24,11 @@ import (
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/config"
 )
 
 /*
@@ -36,6 +37,8 @@ var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 */
 
+var conf *config.Config
+
 // IgnoreInvalidCQCode 是否忽略无效CQ码
 var IgnoreInvalidCQCode = false
 
@@ -46,15 +49,9 @@ var SplitURL = false
 var magicCQ = uint32(0)
 
 func init() {
-	const sizeInt = int(unsafe.Sizeof(0))
+	conf = config.Get()
-	x := 0x1234
+	CQHeader := "[CQ:"
-	p := unsafe.Pointer(&x)
+	magicCQ = *(*uint32)(unsafe.Pointer((*reflect.StringHeader)(unsafe.Pointer(&CQHeader)).Data))
-	p2 := (*[sizeInt]byte)(p)
-	if p2[0] == 0 {
-		magicCQ = goBinary.BigEndian.Uint32([]byte("[CQ:"))
-	} else {
-		magicCQ = goBinary.LittleEndian.Uint32([]byte("[CQ:"))
-	}
 }
 
 // add 指针运算
@@ -62,8 +59,11 @@ func add(ptr unsafe.Pointer, offset uintptr) unsafe.Pointer {
 	return unsafe.Pointer(uintptr(ptr) + offset)
 }
 
-const maxImageSize = 1024 * 1024 * 30  // 30MB
+const (
-const maxVideoSize = 1024 * 1024 * 100 // 100MB
+	maxImageSize = 1024 * 1024 * 30  // 30MB
+	maxVideoSize = 1024 * 1024 * 100 // 100MB
+)
+
 // PokeElement 拍一拍
 type PokeElement struct {
 	Target int64
@@ -127,7 +127,7 @@ func (e *PokeElement) Type() message.ElementType {
 
 // ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
 func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []MSG) {
-	r = []MSG{}
+	r = make([]MSG, 0, len(e))
 	ur := false
 	if len(isRaw) != 0 {
 		ur = isRaw[0]
@@ -138,14 +138,35 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
 		return ok
 	})
 	if reply != nil {
-		r = append(r, MSG{
+		replyElem := reply.(*message.ReplyElement)
-			"type": "reply",
+		if conf.Message.ExtraReplyData {
-			"data": map[string]string{"id": fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))},
+			r = append(r, MSG{
-		})
+				"type": "reply",
+				"data": map[string]string{
+					"id":   fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq)),
+					"seq":  string(replyElem.ReplySeq),
+					"qq":   strconv.FormatInt(replyElem.Sender, 10),
+					"time": string(replyElem.Time),
+					"text": CQCodeEscapeValue(CQCodeEscapeText(ToStringMessage(replyElem.Elements, id))),
+				},
+			})
+		} else {
+			r = append(r, MSG{
+				"type": "reply",
+				"data": map[string]string{"id": fmt.Sprint(toGlobalID(id, replyElem.ReplySeq))},
+			})
+		}
 	}
-	for _, elem := range e {
+	for i, elem := range e {
 		var m MSG
 		switch o := elem.(type) {
+		case *message.ReplyElement:
+			if conf.Message.RemoveReplyAt && len(e) > i+1 {
+				elem, ok := e[i+1].(*message.AtElement)
+				if ok && elem.Target == o.Sender {
+					e[i+1] = nil
+				}
+			}
 		case *message.TextElement:
 			m = MSG{
 				"type": "text",
@@ -232,7 +253,7 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
 			} else {
 				m = MSG{
 					"type": "image",
-					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
 				}
 			}
 		case *message.FriendImageElement:
@@ -244,7 +265,7 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
 			} else {
 				m = MSG{
 					"type": "image",
-					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
 				}
 			}
 		case *message.GroupFlashImgElement:
@@ -290,10 +311,25 @@ func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r st
 		return ok
 	})
 	if reply != nil {
-		r += fmt.Sprintf("[CQ:reply,id=%d]", toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))
+		replyElem := reply.(*message.ReplyElement)
+		if conf.Message.ExtraReplyData {
+			r += fmt.Sprintf("[CQ:reply,id=%d,seq=%d,qq=%d,time=%d,text=%s]",
+				toGlobalID(id, replyElem.ReplySeq),
+				replyElem.ReplySeq, replyElem.Sender, replyElem.Time,
+				CQCodeEscapeValue(CQCodeEscapeText(ToStringMessage(replyElem.Elements, id))))
+		} else {
+			r += fmt.Sprintf("[CQ:reply,id=%d]", toGlobalID(id, replyElem.ReplySeq))
+		}
 	}
-	for _, elem := range e {
+	for i, elem := range e {
 		switch o := elem.(type) {
+		case *message.ReplyElement:
+			if conf.Message.RemoveReplyAt && len(e) > i+1 {
+				elem, ok := e[i+1].(*message.AtElement)
+				if ok && elem.Target == o.Sender {
+					e[i+1] = nil
+				}
+			}
 		case *message.TextElement:
 			r += CQCodeEscapeText(o.Content)
 		case *message.AtElement:
@@ -330,13 +366,13 @@ func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r st
 			if ur {
 				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
 			} else {
-				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
 			}
 		case *message.FriendImageElement:
 			if ur {
 				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
 			} else {
-				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
 			}
 		case *message.GroupFlashImgElement:
 			return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
@@ -359,7 +395,7 @@ func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r st
 // ConvertStringMessage 将消息字符串转为消息元素数组
 func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMessageElement) {
 	var t, key string
-	var d = map[string]string{}
+	d := map[string]string{}
 	ptr := unsafe.Pointer((*reflect.StringHeader)(unsafe.Pointer(&s)).Data)
 	l := len(s)
 	i, j, CQBegin := 0, 0, 0
@@ -374,7 +410,49 @@ func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMes
 			}
 			mid, err := strconv.Atoi(d["id"])
 			customText := d["text"]
-			if err == nil {
+			switch {
+			case customText != "":
+				var elem *message.ReplyElement
+				var org MSG
+				sender, senderErr := strconv.ParseInt(d["qq"], 10, 64)
+				if senderErr != nil && err != nil {
+					log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
+					break
+				}
+				msgTime, timeErr := strconv.ParseInt(d["time"], 10, 64)
+				if timeErr != nil {
+					msgTime = time.Now().Unix()
+				}
+				messageSeq, seqErr := strconv.ParseInt(d["seq"], 10, 64)
+				if err == nil {
+					org = bot.GetMessage(int32(mid))
+				}
+				if org != nil {
+					elem = &message.ReplyElement{
+						ReplySeq: org["message-id"].(int32),
+						Sender:   org["sender"].(message.Sender).Uin,
+						Time:     org["time"].(int32),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
+					}
+					if senderErr != nil {
+						elem.Sender = sender
+					}
+					if timeErr != nil {
+						elem.Time = int32(msgTime)
+					}
+					if seqErr != nil {
+						elem.ReplySeq = int32(messageSeq)
+					}
+				} else {
+					elem = &message.ReplyElement{
+						ReplySeq: int32(messageSeq),
+						Sender:   sender,
+						Time:     int32(msgTime),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
+					}
+				}
+				r = append([]message.IMessageElement{elem}, r...)
+			case err == nil:
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
 					r = append([]message.IMessageElement{
@@ -385,38 +463,23 @@ func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMes
 							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
 						},
 					}, r...)
-					return
 				}
-			} else if customText != "" {
+			default:
-				sender, err := strconv.ParseInt(d["qq"], 10, 64)
+				log.Warnf("警告: Reply 元素中必须包含 text 或 id")
-				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
-					return
-				}
-				msgTime, err := strconv.ParseInt(d["time"], 10, 64)
-				if err != nil {
-					msgTime = time.Now().Unix()
-				}
-				messageSeq, err := strconv.ParseInt(d["seq"], 10, 64)
-				if err != nil {
-					messageSeq = 0
-				}
-				r = append([]message.IMessageElement{
-					&message.ReplyElement{
-						ReplySeq: int32(messageSeq),
-						Sender:   sender,
-						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
-					},
-				}, r...)
-				return
 			}
+			return
 		}
 		if t == "forward" { // 单独处理转发
 			if id, ok := d["id"]; ok {
-				r = []message.IMessageElement{bot.Client.DownloadForwardMessage(id)}
+				if fwdMsg := bot.Client.DownloadForwardMessage(id); fwdMsg == nil {
-				return
+					log.Warnf("警告: Forward 信息不存在或已过期")
+				} else {
+					r = []message.IMessageElement{fwdMsg}
+				}
+			} else {
+				log.Warnf("警告: Forward 元素中必须包含 id")
 			}
+			return
 		}
 		elem, err := bot.ToElement(t, d, isGroup)
 		if err != nil {
@@ -442,7 +505,13 @@ S1: // Plain Text
 		if *(*byte)(add(ptr, uintptr(i))) == '[' && i+4 < l &&
 			*(*uint32)(add(ptr, uintptr(i))) == magicCQ { // Magic :uint32([]byte("[CQ:"))
 			if i > j {
-				r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+				if SplitURL {
+					for _, str := range global.SplitURL(CQCodeUnescapeText(s[j:i])) {
+						r = append(r, message.NewText(str))
+					}
+				} else {
+					r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+				}
 			}
 			CQBegin = i
 			i += 4
@@ -500,7 +569,13 @@ S4: // CQCode param value
 	goto End
 End:
 	if i > j {
-		r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+		if SplitURL {
+			for _, str := range global.SplitURL(CQCodeUnescapeText(s[j:i])) {
+				r = append(r, message.NewText(str))
+			}
+		} else {
+			r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+		}
 	}
 	return
 }
@@ -516,9 +591,51 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 					return
 				}
 			}
-			mid, err := strconv.Atoi(e.Get("data").Get("id").String())
+			mid, err := strconv.Atoi(e.Get("data.id").String())
-			customText := e.Get("data").Get("text").String()
+			customText := e.Get("data.text").String()
-			if err == nil {
+			switch {
+			case customText != "":
+				var elem *message.ReplyElement
+				var org MSG
+				sender, senderErr := strconv.ParseInt(e.Get("data.qq").String(), 10, 64)
+				if senderErr != nil && err != nil {
+					log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
+					break
+				}
+				msgTime, timeErr := strconv.ParseInt(e.Get("data.time").String(), 10, 64)
+				if timeErr != nil {
+					msgTime = time.Now().Unix()
+				}
+				messageSeq, seqErr := strconv.ParseInt(e.Get("data.seq").String(), 10, 64)
+				if err == nil {
+					org = bot.GetMessage(int32(mid))
+				}
+				if org != nil {
+					elem = &message.ReplyElement{
+						ReplySeq: org["message-id"].(int32),
+						Sender:   org["sender"].(message.Sender).Uin,
+						Time:     org["time"].(int32),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
+					}
+					if senderErr != nil {
+						elem.Sender = sender
+					}
+					if timeErr != nil {
+						elem.Time = int32(msgTime)
+					}
+					if seqErr != nil {
+						elem.ReplySeq = int32(messageSeq)
+					}
+				} else {
+					elem = &message.ReplyElement{
+						ReplySeq: int32(messageSeq),
+						Sender:   sender,
+						Time:     int32(msgTime),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
+					}
+				}
+				r = append([]message.IMessageElement{elem}, r...)
+			case err == nil:
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
 					r = append([]message.IMessageElement{
@@ -529,35 +646,23 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
 						},
 					}, r...)
-					return
 				}
-			} else if customText != "" {
+			default:
-				sender, err := strconv.ParseInt(e.Get("data").Get("qq").String(), 10, 64)
+				log.Warnf("警告: Reply 元素中必须包含 text 或 id")
-				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
-					return
-				}
-				msgTime, err := strconv.ParseInt(e.Get("data").Get("time").String(), 10, 64)
-				if err != nil {
-					msgTime = time.Now().Unix()
-				}
-				messageSeq, err := strconv.ParseInt(e.Get("data").Get("seq").String(), 10, 64)
-				if err != nil {
-					messageSeq = 0
-				}
-				r = append([]message.IMessageElement{
-					&message.ReplyElement{
-						ReplySeq: int32(messageSeq),
-						Sender:   sender,
-						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
-					},
-				}, r...)
-				return
 			}
+			return
 		}
 		if t == "forward" {
-			r = []message.IMessageElement{bot.Client.DownloadForwardMessage(e.Get("data.id").String())}
+			id := e.Get("data.id").String()
+			if id == "" {
+				log.Warnf("警告: Forward 元素中必须包含 id")
+			} else {
+				if fwdMsg := bot.Client.DownloadForwardMessage(id); fwdMsg == nil {
+					log.Warnf("警告: Forward 信息不存在或已过期")
+				} else {
+					r = []message.IMessageElement{fwdMsg}
+				}
+			}
 			return
 		}
 		d := make(map[string]string)
@@ -698,7 +803,11 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 			return message.AtAll(), nil
 		}
 		t, _ := strconv.ParseInt(qq, 10, 64)
-		return message.NewAt(t), nil
+		name := strings.TrimSpace(d["name"])
+		if len(name) > 0 {
+			name = "@" + name
+		}
+		return message.NewAt(t, name), nil
 	case "share":
 		return message.NewUrlShare(d["url"], d["title"], d["content"], d["image"]), nil
 	case "music":
@@ -761,14 +870,14 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		}
 		if d["type"] == "custom" {
 			if d["subtype"] != "" {
-				var subtype = map[string]int{
+				subtype := map[string]int{
 					"qq":    message.QQMusic,
 					"163":   message.CloudMusic,
 					"migu":  message.MiguMusic,
 					"kugou": message.KugouMusic,
 					"kuwo":  message.KuwoMusic,
 				}
-				var musicType = 0
+				musicType := 0
 				if tp, ok := subtype[d["subtype"]]; ok {
 					musicType = tp
 				}
@@ -859,7 +968,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
-		var header = make([]byte, 4)
+		header := make([]byte, 4)
 		_, err = video.Read(header)
 		if err != nil {
 			return nil, err
@@ -867,7 +976,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if !bytes.Equal(header, []byte{0x66, 0x74, 0x79, 0x70}) { // check file header ftyp
 			_, _ = video.Seek(0, io.SeekStart)
 			hash, _ := utils.ComputeMd5AndLength(video)
-			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".mp4")
+			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".mp4")
 			if global.PathExists(cacheFile) && cache == "1" {
 				goto ok
 			}
@@ -971,7 +1080,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 		}
 		hash := md5.Sum([]byte(f))
 		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
-		var maxSize = func() int64 {
+		maxSize := func() int64 {
 			if video {
 				return maxVideoSize
 			}

coolq/event.go

@@ -8,10 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/global"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -49,6 +50,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		"sub_type":     "friend",
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
+		"target_id":    m.Target,
 		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
@@ -101,10 +103,11 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	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, m.Sender.Uin, 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)
@@ -114,6 +117,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
+		"temp_source":  e.Session.Source,
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
@@ -238,6 +242,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"
 				}
@@ -248,8 +256,7 @@ 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:
 		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
 		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
@@ -379,7 +386,7 @@ 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{
 		"post_type":   "notice",
 		"notice_type": "friend_add",

docs/config.md

@@ -1,97 +1,137 @@
 # 配置
 
-go-cqhttp 包含 `config.hjson` 和 `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
+````yaml
-{
+# go-cqhttp 默认配置文件
-  "uin": 0,
+
-  "password": "",
+account: # 账号相关
-  "encrypt_password": false,
+  uin: 1233456 # QQ账号
-  "password_encrypted": "",
+  password: '' # 密码为空时使用扫码登录
-  "enable_db": true,
+  encrypt: false  # 是否开启密码加密
-  "enable_self_message": false,
+  relogin:        # 重连设置
-  "access_token": "",
+    disabled: false
-  "relogin": {
+    delay: 3      # 重连延迟, 单位秒
-    "enabled": true,
+    interval: 0   # 重连间隔
-    "relogin_delay": 3,
+    max-times: 0  # 最大重连次数, 0为无限制
-    "max_relogin_times": 0
+
-  },
+  # 是否使用服务器下发的新地址进行重连
-  "_rate_limit": {
+  # 注意, 此设置可能导致在海外服务器上连接情况更差
-    "enabled": false,
+  use-sso-address: true
-    "frequency": 1,
+
-    "bucket_size": 1
+heartbeat:
-  },
+  disabled: false # 是否开启心跳事件上报
-  "post_message_format": "string",
+  # 心跳频率, 单位秒
-  "ignore_invalid_cqcode": false,
+  # -1 为关闭心跳
-  "force_fragmented": true,
+  interval: 5
-  "heartbeat_interval": 5,
+
-  "use_sso_address": false,
+message:
-  "http_config": {
+  # 上报数据类型
-    "enabled": true,
+  # 可选: string,array
-    "host": "0.0.0.0",
+  post-format: string
-    "port": 5700,
+  # 是否忽略无效的CQ码, 如果为假将原样发送
-    "timeout": 5,
+  ignore-invalid-cqcode: false
-    "post_urls": {
+  # 是否强制分片发送消息
-      "url:port": "secret"
+  # 分片发送将会带来更快的速度
-    }
+  # 但是兼容性会有些问题
-  },
+  force-fragment: false
-  "ws_config": {
+  # 是否将url分片发送
-    "enabled": true,
+  fix-url: false
-    "host": "0.0.0.0",
+  # 下载图片等请求网络代理
-    "port": 6700
+  proxy-rewrite: ''
-  },
+  # 是否上报自身消息
-  "ws_reverse_servers": [
+  report-self-message: false
-    {
+
-      "enabled": false,
+output:
-      "reverse_url": "ws://you_websocket_universal.server",
+  # 日志等级 trace,debug,info,warn,error日志等级 trace,debug,info,warn,error
-      "reverse_api_url": "ws://you_websocket_api.server",
+  log-level: warn
-      "reverse_event_url": "ws://you_websocket_event.server",
+  # 是否启用 DEBUG
-      "reverse_reconnect_interval": 3000
+  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:
+      # 是否关闭正向HTTP服务器
+      disabled: false
+      # 服务端监听地址
+      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服务器
+      disabled: true
+      # 正向WS服务器监听地址
+      host: 127.0.0.1
+      # 正向WS服务器监听端口
+      port: 6700
+      middlewares:
+        <<: *default # 引用默认中间件
+
+  - ws-reverse:
+      # 是否禁用当前反向WS服务
+      disabled: true
+      # 反向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 # 引用默认中间件
+
+  # 可添加更多
+  #- ws-reverse:
+  #- ws:
+  #- http:
+
+database: # 数据库相关设置
+  leveldb:
+    # 是否启用内置leveldb数据库
+    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
+    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable: true
 ````
 
-| 字段                  | 类型     | 说明                                                                                     |
-| --------------------- | -------- | ---------------------------------------------------------------------------------------- |
-| uin                   | int64    | 登录用QQ号                                                                               |
-| password              | string   | 登录用密码                                                                               |
-| encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
-| password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
-| enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
-| enable_self_message   | bool     | 是否启用 `message_sent` 事件                                                       |
-| access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
-| relogin               | bool     | 是否自动重新登录                                                                         |
-| relogin_delay         | int      | 重登录延时（秒）                                                                         |
-| max_relogin_times     | uint     | 最大重登录次数，若0则不设置上限                                                          |
-| _rate_limit           | bool     | 是否启用API调用限速                                                                      |
-| frequency             | float64  | 1s内能调用API的次数                                                                      |
-| bucket_size           | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                               |
-| post_message_format   | string   | 上报信息类型                                                                             |
-| ignore_invalid_cqcode | bool     | 是否忽略错误的CQ码                                                                       |
-| force_fragmented      | bool     | 是否强制分片发送群长消息                                                                 |
-| fix_url               | bool     | 是否对链接的发送进行预处理, 可缓解链接信息被风控导致无法发送的情况, 但可能影响客户端着色(不影响内容)|
-| use_sso_address       | bool     | 是否使用服务器下发的地址                                                                 |
-| heartbeat_interval    | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)                              |
-| http_config           | object   | HTTP API配置                                                                             |
-| ws_config             | object   | Websocket API 配置                                                                       |
-| ws_reverse_servers    | object[] | 反向 Websocket API 配置                                                                  |
-| log_level             | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error |
-
 > 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
-> 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
+> 解密后密码的哈希将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
 > 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
 
 > 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.

docs/cqhttp.md

@@ -29,7 +29,6 @@
 - [发送合并转发(群)](#发送合并转发群)
 - [获取中文分词](#获取中文分词)
 - [图片OCR](#图片ocr)
-- [获取中文分词](#获取中文分词)
 - [获取群系统消息](#获取群文件系统信息)
 - [获取群文件系统信息](#获取群文件系统信息)
 - [获取群根目录文件列表](#获取群根目录文件列表)

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.Cap() < maxSize { // 对于大Buffer直接丢弃
+		buf.Reset()
+		bufferPool.Put(buf)
+	}
+}

global/codec.go

@@ -8,6 +8,7 @@ import (
 	"path"
 
 	"github.com/Mrs4s/go-cqhttp/global/codec"
+
 	"github.com/pkg/errors"
 )
 

global/codec/codec.go

@@ -1,4 +1,4 @@
-// +build linux windows,!arm darwin,!arm64
+// +build linux windows,!arm darwin
 // +build 386 amd64 arm arm64
 
 // Package codec Slik编码核心模块
@@ -18,7 +18,7 @@ const (
 	silkCachePath = "data/cache"
 )
 
-//EncodeToSilk 将音频编码为Silk
+// EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
 	// 1. 写入缓存文件
 	rawPath := path.Join(silkCachePath, tempName+".wav")

global/codec/codec_darwin_arm64.go

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

global/config.go

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

global/config/config.go

@@ -0,0 +1,133 @@
+// Package config 包含go-cqhttp操作配置文件的相关函数
+package config
+
+import (
+	_ "embed" // embed the default config file
+	"os"
+	"path"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
+)
+
+// DefaultConfig 默认配置文件
+//go:embed default_config.yml
+var DefaultConfig string
+
+var currentPath = getCurrentPath()
+
+// DefaultConfigFile 默认配置文件路径
+var DefaultConfigFile = path.Join(currentPath, "config.yml")
+
+// Config 总配置文件
+type Config struct {
+	Account struct {
+		Uin      int64  `yaml:"uin"`
+		Password string `yaml:"password"`
+		Encrypt  bool   `yaml:"encrypt"`
+		ReLogin  struct {
+			Disabled bool `yaml:"disabled"`
+			Delay    int  `yaml:"delay"`
+			MaxTimes uint `yaml:"max-times"`
+			Interval int  `yaml:"interval"`
+		}
+		UseSSOAddress bool `yaml:"use-sso-address"`
+	} `yaml:"account"`
+
+	Heartbeat struct {
+		Disabled bool `yaml:"disabled"`
+		Interval int  `yaml:"interval"`
+	} `yaml:"heartbeat"`
+
+	Message struct {
+		PostFormat          string `yaml:"post-format"`
+		IgnoreInvalidCQCode bool   `yaml:"ignore-invalid-cqcode"`
+		ForceFragment       bool   `yaml:"force-fragment"`
+		FixURL              bool   `yaml:"fix-url"`
+		ProxyRewrite        string `yaml:"proxy-rewrite"`
+		ReportSelfMessage   bool   `yaml:"report-self-message"`
+		RemoveReplyAt       bool   `yaml:"remove-reply-at"`
+		ExtraReplyData      bool   `yaml:"extra-reply-data"`
+	} `yaml:"message"`
+
+	Output struct {
+		LogLevel string `yaml:"log-level"`
+		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"`
+	Post     []struct {
+		URL    string `yaml:"url"`
+		Secret string `yaml:"secret"`
+	}
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// 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"`
+}
+
+// LevelDBConfig leveldb 相关配置
+type LevelDBConfig struct {
+	Enable bool `yaml:"enable"`
+}
+
+// Get 从默认配置文件路径中获取
+func Get() *Config {
+	file, err := os.Open(DefaultConfigFile)
+	if err != nil {
+		log.Error("获取配置文件失败: ", err)
+		return nil
+	}
+	config := &Config{}
+	if yaml.NewDecoder(file).Decode(config) != nil {
+		log.Fatal("配置文件不合法!", err)
+	}
+	return config
+}
+
+// getCurrentPath 获取当前文件的路径，直接返回string
+func getCurrentPath() string {
+	cwd, e := os.Getwd()
+	if e != nil {
+		panic(e)
+	}
+	return cwd
+}

global/config/default_config.yml

@@ -0,0 +1,123 @@
+# go-cqhttp 默认配置文件
+
+account: # 账号相关
+  uin: 1233456 # QQ账号
+  password: '' # 密码为空时使用扫码登录
+  encrypt: false  # 是否开启密码加密
+  relogin:        # 重连设置
+    disabled: false
+    delay: 3      # 重连延迟, 单位秒
+    interval: 0   # 重连间隔
+    max-times: 0  # 最大重连次数, 0为无限制
+
+  # 是否使用服务器下发的新地址进行重连
+  # 注意, 此设置可能导致在海外服务器上连接情况更差
+  use-sso-address: true
+
+heartbeat:
+  disabled: false # 是否开启心跳事件上报
+  # 心跳频率, 单位秒
+  # -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
+
+output:
+  # 日志等级 trace,debug,info,warn,error日志等级 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:
+      # 是否关闭正向HTTP服务器
+      disabled: false
+      # 服务端监听地址
+      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服务器
+      disabled: true
+      # 正向WS服务器监听地址
+      host: 127.0.0.1
+      # 正向WS服务器监听端口
+      port: 6700
+      middlewares:
+        <<: *default # 引用默认中间件
+
+  - ws-reverse:
+      # 是否禁用当前反向WS服务
+      disabled: true
+      # 反向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 # 引用默认中间件
+
+  # 可添加更多
+  #- ws-reverse:
+  #- ws:
+  #- http:
+
+database: # 数据库相关设置
+  leveldb:
+    # 是否启用内置leveldb数据库
+    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
+    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable: true

global/filter.go

@@ -1,51 +1,15 @@
 package global
 
 import (
-	"fmt"
-	"io/ioutil"
 	"regexp"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
-// MSG 消息Map
-type MSG map[string]interface{}
-
-// Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
-//
-// 若所给key对应的值的类型是global.MSG,则返回此值
-//
-// 若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
-func (m MSG) Get(s string) MSG {
-	if v, ok := m[s]; ok {
-		if msg, ok := v.(MSG); ok {
-			return msg
-		}
-		return MSG{"__str__": v} // 用这个名字应该没问题吧
-	}
-	return nil // 不存在为空
-}
-
-// String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
-func (m MSG) String() string {
-	if m == nil {
-		return "" // 空 JSON
-	}
-	if str, ok := m["__str__"]; ok {
-		if str == nil {
-			return "" // 空 JSON
-		}
-		return fmt.Sprint(str)
-	}
-	str, _ := json.MarshalToString(m)
-	return str
-}
-
 // Filter 定义了一个消息上报过滤接口
 type Filter interface {
-	Eval(payload MSG) bool
+	Eval(payload gjson.Result) bool
 }
 
 type operationNode struct {
@@ -68,7 +32,7 @@ func notOperatorConstruct(argument gjson.Result) *NotOperator {
 }
 
 // Eval 对payload执行Not过滤
-func (op *NotOperator) Eval(payload MSG) bool {
+func (op *NotOperator) Eval(payload gjson.Result) bool {
 	return !op.operand.Eval(payload)
 }
 
@@ -83,21 +47,22 @@ func andOperatorConstruct(argument gjson.Result) *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)})
-		} 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)})
-		} else {
+		default:
 			// is an normal key with a non-object as the value
 			//   "foo": "bar"
 			opKey := key.String()
@@ -109,10 +74,9 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 }
 
 // Eval 对payload执行And过滤
-func (op *AndOperator) Eval(payload MSG) bool {
+func (op *AndOperator) Eval(payload gjson.Result) bool {
 	res := true
 	for _, operand := range op.operands {
-
 		if len(operand.key) == 0 {
 			// is an operator
 			res = res && operand.filter.Eval(payload)
@@ -147,7 +111,7 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
 }
 
 // Eval 对payload执行Or过滤
-func (op *OrOperator) Eval(payload MSG) bool {
+func (op *OrOperator) Eval(payload gjson.Result) bool {
 	res := false
 	for _, operand := range op.operands {
 		res = res || operand.Eval(payload)
@@ -170,7 +134,7 @@ func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
 }
 
 // Eval 对payload执行Equal过滤
-func (op *EqualOperator) Eval(payload MSG) bool {
+func (op *EqualOperator) Eval(payload gjson.Result) bool {
 	return payload.String() == op.operand
 }
 
@@ -186,7 +150,7 @@ func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
 }
 
 // Eval 对payload执行NotEqual过滤
-func (op *NotEqualOperator) Eval(payload MSG) bool {
+func (op *NotEqualOperator) Eval(payload gjson.Result) bool {
 	return !(payload.String() == op.operand)
 }
 
@@ -214,7 +178,7 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
 }
 
 // Eval 对payload执行In过滤
-func (op *InOperator) Eval(payload MSG) bool {
+func (op *InOperator) Eval(payload gjson.Result) bool {
 	payloadStr := payload.String()
 	if op.operandArray != nil {
 		for _, value := range op.operandArray {
@@ -242,7 +206,7 @@ func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
 }
 
 // Eval 对payload执行Contains过滤
-func (op *ContainsOperator) Eval(payload MSG) bool {
+func (op *ContainsOperator) Eval(payload gjson.Result) bool {
 	return strings.Contains(payload.String(), op.operand)
 }
 
@@ -261,7 +225,7 @@ func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
 }
 
 // Eval 对payload执行RegexO过滤
-func (op *RegexOperator) Eval(payload MSG) bool {
+func (op *RegexOperator) Eval(payload gjson.Result) bool {
 	matched := op.regex.MatchString(payload.String())
 	return matched
 }
@@ -289,24 +253,3 @@ func Generate(opName string, argument gjson.Result) Filter {
 		panic("the operator " + opName + " is not supported")
 	}
 }
-
-// EventFilter 初始化一个nil过滤器
-var EventFilter Filter
-
-// BootFilter 启动事件过滤器
-func BootFilter() {
-	defer func() {
-		if e := recover(); e != nil {
-			log.Warnf("事件过滤器启动失败: %v", e)
-			EventFilter = nil
-		} else {
-			log.Info("事件过滤器启动成功.")
-		}
-	}()
-	f, err := ioutil.ReadFile("filter.json")
-	if err != nil {
-		panic(err)
-	} else {
-		EventFilter = Generate("and", gjson.ParseBytes(f))
-	}
-}

global/fs.go

@@ -1,39 +1,31 @@
 package global
 
 import (
-	"bufio"
 	"bytes"
-	"compress/bzip2"
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
 	"errors"
-	"fmt"
-	"io"
 	"io/ioutil"
 	"net"
 	"net/url"
 	"os"
 	"path"
-	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 
-	"github.com/kardianos/osext"
-
-	"github.com/dustin/go-humanize"
 	log "github.com/sirupsen/logrus"
 )
 
 const (
 	// ImagePath go-cqhttp使用的图片缓存目录
 	ImagePath = "data/images"
-	// ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
+	// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
 	ImagePathOld = "data/image"
 	// VoicePath go-cqhttp使用的语音缓存目录
 	VoicePath = "data/voices"
-	// VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
+	// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
 	VoicePathOld = "data/record"
 	// VideoPath go-cqhttp使用的视频缓存目录
 	VideoPath = "data/videos"
@@ -72,8 +64,11 @@ func WriteAllText(path, text string) error {
 }
 
 // Check 检测err是否为nil
-func Check(err error) {
+func Check(err error, deleteSession bool) {
 	if err != nil {
+		if deleteSession && PathExists("session.token") {
+			_ = os.Remove("session.token")
+		}
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
@@ -83,11 +78,12 @@ func IsAMRorSILK(b []byte) bool {
 	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
 }
 
-// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
+// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
 // 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
-func FindFile(file, cache, PATH string) (data []byte, err error) {
+func FindFile(file, cache, p string) (data []byte, err error) {
 	data, err = nil, ErrSyntax
-	if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") {
+	switch {
+	case strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https"):
 		if cache == "" {
 			cache = "1"
 		}
@@ -101,12 +97,12 @@ func FindFile(file, cache, PATH string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	} else if strings.HasPrefix(file, "base64") {
+	case strings.HasPrefix(file, "base64"):
 		data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(file, "base64://", ""))
 		if err != nil {
 			return nil, err
 		}
-	} else if strings.HasPrefix(file, "file") {
+	case strings.HasPrefix(file, "file"):
 		var fu *url.URL
 		fu, err = url.Parse(file)
 		if err != nil {
@@ -119,8 +115,8 @@ func FindFile(file, cache, PATH string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	} else if PathExists(path.Join(PATH, file)) {
+	case PathExists(path.Join(p, file)):
-		data, err = ioutil.ReadFile(path.Join(PATH, file))
+		data, err = ioutil.ReadFile(path.Join(p, file))
 		if err != nil {
 			return nil, err
 		}
@@ -159,95 +155,3 @@ func ReadAddrFile(path string) []*net.TCPAddr {
 	}
 	return ret
 }
-
-// WriteCounter 写入量计算实例
-type WriteCounter struct {
-	Total uint64
-}
-
-// Write 方法将写入的byte长度追加至写入的总长度Total中
-func (wc *WriteCounter) Write(p []byte) (int, error) {
-	n := len(p)
-	wc.Total += uint64(n)
-	wc.PrintProgress()
-	return n, nil
-}
-
-// PrintProgress 方法将打印当前的总写入量
-func (wc *WriteCounter) PrintProgress() {
-	fmt.Printf("\r%s", strings.Repeat(" ", 35))
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
-}
-
-// UpdateFromStream copy form getlantern/go-update
-func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
-	updatePath, err := osext.Executable()
-	if err != nil {
-		return
-	}
-	var newBytes []byte
-	// no patch to apply, go on through
-	var fileHeader []byte
-	bufBytes := bufio.NewReader(updateWith)
-	fileHeader, err = bufBytes.Peek(2)
-	if err != nil {
-		return
-	}
-	// The content is always bzip2 compressed except when running test, in
-	// which case is not prefixed with the magic byte sequence for sure.
-	if bytes.Equal([]byte{0x42, 0x5a}, fileHeader) {
-		// Identifying bzip2 files.
-		updateWith = bzip2.NewReader(bufBytes)
-	} else {
-		updateWith = io.Reader(bufBytes)
-	}
-	newBytes, err = ioutil.ReadAll(updateWith)
-	if err != nil {
-		return
-	}
-	// get the directory the executable exists in
-	updateDir := filepath.Dir(updatePath)
-	filename := filepath.Base(updatePath)
-	// Copy the contents of of newbinary to a the new executable file
-	newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
-	fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
-	if err != nil {
-		return
-	}
-	// We won't log this error, because it's always going to happen.
-	defer func() { _ = fp.Close() }()
-	if _, err = io.Copy(fp, bytes.NewReader(newBytes)); err != nil {
-		log.Errorf("Unable to copy data: %v\n", err)
-	}
-
-	// if we don't call fp.Close(), windows won't let us move the new executable
-	// because the file will still be "in use"
-	if err := fp.Close(); err != nil {
-		log.Errorf("Unable to close file: %v\n", err)
-	}
-	// this is where we'll move the executable to so that we can swap in the updated replacement
-	oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
-
-	// delete any existing old exec file - this is necessary on Windows for two reasons:
-	// 1. after a successful update, Windows can't remove the .old file because the process is still running
-	// 2. windows rename operations fail if the destination file already exists
-	_ = os.Remove(oldPath)
-
-	// move the existing executable to a new file in the same directory
-	err = os.Rename(updatePath, oldPath)
-	if err != nil {
-		return
-	}
-
-	// move the new executable in to become the new program
-	err = os.Rename(newPath, updatePath)
-
-	if err != nil {
-		// copy unsuccessful
-		errRecover = os.Rename(oldPath, updatePath)
-	} else {
-		// copy successful, remove the old binary
-		_ = os.Remove(oldPath)
-	}
-	return
-}

global/log_hook.go

@@ -54,7 +54,6 @@ func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
 	defer fd.Close()
 
 	log, err := hook.formatter.Format(entry)
-
 	if err != nil {
 		return err
 	}
@@ -142,24 +141,36 @@ func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus
 func GetLogLevel(level string) []logrus.Level {
 	switch level {
 	case "trace":
-		return []logrus.Level{logrus.TraceLevel, logrus.DebugLevel,
+		return []logrus.Level{
+			logrus.TraceLevel, logrus.DebugLevel,
 			logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel}
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
 	case "debug":
-		return []logrus.Level{logrus.DebugLevel, logrus.InfoLevel,
+		return []logrus.Level{
+			logrus.DebugLevel, logrus.InfoLevel,
 			logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel}
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
 	case "info":
-		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+		return []logrus.Level{
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
+			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
+		}
 	case "warn":
-		return []logrus.Level{logrus.WarnLevel, logrus.ErrorLevel,
+		return []logrus.Level{
-			logrus.FatalLevel, logrus.PanicLevel}
+			logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel,
+		}
 	case "error":
-		return []logrus.Level{logrus.ErrorLevel, logrus.FatalLevel,
+		return []logrus.Level{
-			logrus.PanicLevel}
+			logrus.ErrorLevel, logrus.FatalLevel,
+			logrus.PanicLevel,
+		}
 	default:
-		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+		return []logrus.Level{
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
+			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
+		}
 	}
 }

global/net.go

@@ -140,7 +140,6 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 
 		for k, v := range headers {
 			req.Header.Set(k, v)
-
 		}
 		if _, ok := headers["User-Agent"]; !ok {
 			req.Header["User-Agent"] = []string{UserAgent}
@@ -150,6 +149,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		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))
 		}
@@ -169,7 +169,6 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 					return (contentLength / int64(threadCount)) - 10
 				}
 				return contentLength
-
 			}()
 			if blockSize == contentLength {
 				return copyStream(resp.Body)
@@ -218,7 +217,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
 		}
-		var buffer = make([]byte, 1024)
+		buffer := make([]byte, 1024)
 		i, err := resp.Body.Read(buffer)
 		for {
 			if err != nil && err != io.EOF {

global/ratelimit.go

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

global/terminal/doc.go

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

global/terminal/double_click.go

@@ -2,6 +2,7 @@
 
 package terminal
 
+// RunningByDoubleClick 检查是否通过双击直接运行,非Windows系统永远返回false
 func RunningByDoubleClick() bool {
 	return false
 }

global/update/update.go

@@ -0,0 +1,97 @@
+// Package update 包含go-cqhttp自我更新相关函数
+package update
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/dustin/go-humanize"
+	"github.com/kardianos/osext"
+	log "github.com/sirupsen/logrus"
+)
+
+// WriteCounter 写入量计算实例
+type WriteCounter struct {
+	Total uint64
+}
+
+// Write 方法将写入的byte长度追加至写入的总长度Total中
+func (wc *WriteCounter) Write(p []byte) (int, error) {
+	n := len(p)
+	wc.Total += uint64(n)
+	wc.PrintProgress()
+	return n, nil
+}
+
+// PrintProgress 方法将打印当前的总写入量
+func (wc *WriteCounter) PrintProgress() {
+	fmt.Printf("\r%s", strings.Repeat(" ", 35))
+	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
+}
+
+// FromStream copy form getlantern/go-update
+func FromStream(updateWith io.Reader) (err error, errRecover error) {
+	updatePath, err := osext.Executable()
+	if err != nil {
+		return
+	}
+	var newBytes []byte
+	// no patch to apply, go on through
+	bufBytes := bufio.NewReader(updateWith)
+	updateWith = io.Reader(bufBytes)
+	newBytes, err = ioutil.ReadAll(updateWith)
+	if err != nil {
+		return
+	}
+	// get the directory the executable exists in
+	updateDir := filepath.Dir(updatePath)
+	filename := filepath.Base(updatePath)
+	// Copy the contents of of newbinary to a the new executable file
+	newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
+	fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
+	if err != nil {
+		return
+	}
+	// We won't log this error, because it's always going to happen.
+	defer func() { _ = fp.Close() }()
+	if _, err = io.Copy(fp, bytes.NewReader(newBytes)); err != nil {
+		log.Errorf("Unable to copy data: %v\n", err)
+	}
+
+	// if we don't call fp.Close(), windows won't let us move the new executable
+	// because the file will still be "in use"
+	if err := fp.Close(); err != nil {
+		log.Errorf("Unable to close file: %v\n", err)
+	}
+	// this is where we'll move the executable to so that we can swap in the updated replacement
+	oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
+
+	// delete any existing old exec file - this is necessary on Windows for two reasons:
+	// 1. after a successful update, Windows can't remove the .old file because the process is still running
+	// 2. windows rename operations fail if the destination file already exists
+	_ = os.Remove(oldPath)
+
+	// move the existing executable to a new file in the same directory
+	err = os.Rename(updatePath, oldPath)
+	if err != nil {
+		return
+	}
+
+	// move the new executable in to become the new program
+	err = os.Rename(newPath, updatePath)
+
+	if err != nil {
+		// copy unsuccessful
+		errRecover = os.Rename(oldPath, updatePath)
+	} else {
+		// copy successful, remove the old binary
+		_ = os.Remove(oldPath)
+	}
+	return
+}

global/update/update_others.go

@@ -0,0 +1,51 @@
+// +build !windows
+
+package update
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"net/http"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// Update go-cqhttp自我更新
+func Update(url string) {
+	resp, err := http.Get(url)
+	if err != nil {
+		log.Error("更新失败: ", err)
+		return
+	}
+	defer resp.Body.Close()
+	wc := WriteCounter{}
+	data, err := io.ReadAll(io.TeeReader(resp.Body, &wc))
+	if err != nil {
+		log.Error("更新失败: ", err)
+		return
+	}
+	gr, err := gzip.NewReader(bytes.NewReader(data))
+	if err != nil {
+		log.Error("更新失败: ", err)
+		return
+	}
+	tr := tar.NewReader(gr)
+	for {
+		header, err := tr.Next()
+		if err == io.EOF {
+			return
+		}
+		if header.Name == "go-cqhttp" {
+			err, _ := FromStream(tr)
+			fmt.Println()
+			if err != nil {
+				log.Error("更新失败!", err)
+				return
+			}
+			log.Info("更新完成！")
+		}
+	}
+}

global/update/update_windows.go

@@ -0,0 +1,36 @@
+package update
+
+import (
+	"archive/zip"
+	"bytes"
+	"fmt"
+	"io"
+	"net/http"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// Update go-cqhttp自我更新
+func Update(url string) {
+	resp, err := http.Get(url)
+	if err != nil {
+		log.Error("更新失败: ", err)
+		return
+	}
+	defer resp.Body.Close()
+	wc := WriteCounter{}
+	rsp, _ := io.ReadAll(io.TeeReader(resp.Body, &wc))
+	reader, _ := zip.NewReader(bytes.NewReader(rsp), resp.ContentLength)
+	file, err := reader.Open("go-cqhttp.exe")
+	if err != nil {
+		log.Error("更新失败!", err)
+		return
+	}
+	err, _ = FromStream(file)
+	fmt.Println()
+	if err != nil {
+		log.Error("更新失败!", err)
+		return
+	}
+	log.Info("更新完成！")
+}

go.mod

@@ -3,26 +3,29 @@ module github.com/Mrs4s/go-cqhttp
 go 1.16
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af
+	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
+	github.com/Mrs4s/MiraiGo v0.0.0-20210406093140-5ec6c651b797
 	github.com/dustin/go-humanize v1.0.0
-	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.4
+	github.com/guonaihong/gout v0.1.6
-	github.com/hjson/hjson-go v3.1.0+incompatible
+	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/json-iterator/go v1.1.10
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.8.1
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/tidwall/gjson v1.6.8
+	github.com/tidwall/gjson v1.7.3
-	github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d
+	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
-	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
+	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	github.com/willf/bitset v1.1.11 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
-	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
+	golang.org/x/term v0.0.0-20210317153231-de623e64d2a6
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 )

go.sum

@@ -1,27 +1,25 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
+github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20210305105331-e11fa95c501f h1:jwejWu/frFn1yf/VS7ZBKt1LU9ASU70kXCysQsXl6Ns=
+github.com/Mrs4s/MiraiGo v0.0.0-20210406093140-5ec6c651b797 h1:u6jJ6bbYghAEM1DVe0SQKoIVva6od7fsdFRRC15DKMw=
-github.com/Mrs4s/MiraiGo v0.0.0-20210305105331-e11fa95c501f/go.mod h1:drSlh4LlYtjOMJxirScUCSnylBKi1NIRxUz7TKdSsNs=
+github.com/Mrs4s/MiraiGo v0.0.0-20210406093140-5ec6c651b797/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
-github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af h1:PPjWwM/KwbHzOyaEwKm3W5JrK6TTxpOSf+Sd4JXxF9s=
-github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
-github.com/a8m/syncmap v0.0.0-20200818084611-4bbbd178de97/go.mod h1:f3iF7/3t9i9hsYF8DPgT0XeIVyNzevhMCKf2445Q6pE=
 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/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
-github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -48,16 +46,20 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 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 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.1.4 h1:uBBoyztMX9okC27OQxqhn6bZ0ROkGyvnEIHwtp3TM4g=
+github.com/guonaihong/gout v0.1.6 h1:Txej4NYvVJLZkW0Xgw1HuWfSWow5BgLF6vqlM2kRdno=
-github.com/guonaihong/gout v0.1.4/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
+github.com/guonaihong/gout v0.1.6/go.mod h1:P6P8+0+toYgmhFqzLxVde+9vQbCDHrxn56V9TglC5io=
-github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+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/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -66,59 +68,71 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALr
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 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.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
 github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
+github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+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/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+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/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
+github.com/tidwall/gjson v1.7.3 h1:9dOulDrkCJf1mwljVMhXNQr9ZL2NvajRX7A1R8c6Qxw=
-github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
+github.com/tidwall/gjson v1.7.3/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
+github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
 github.com/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-20210207032612-169bbdf8861d h1:gJTKbjZtlMt/almOeFi/UpVtT3RHqRWscgEuDtnF5TU=
+github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
-github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d/go.mod h1:twOxzexmM2Il1ReUu1fB5tnUotOq/dp56xjk/ZHwb1I=
+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/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
-github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
+github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -128,10 +142,9 @@ 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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/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=
@@ -139,27 +152,28 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 h1:EC6+IGYTjPpRfv9a2b/6Puw0W+hLtAhkV1tPsXhutqs=
+golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-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-20190501045030-23463209683d/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 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=
@@ -179,18 +193,22 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 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 h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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.7.6 h1:P0qDJAlSR6hSAuE8mQgz9eH/GzigfEd3IIn7HmTQgT0=
+modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
-modernc.org/libc v1.7.6/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+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=

login.go

@@ -0,0 +1,188 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"io/ioutil"
+	"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)
+
+var readLine = func() (str string) {
+	str, _ = console.ReadString('\n')
+	str = strings.TrimSpace(str)
+	return
+}
+
+var readLineTimeout = func(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
+	}
+	_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0644)
+	defer func() { _ = os.Remove("qrcode.png") }()
+	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
+		if s.State == client.QRCodeCanceled {
+			log.Fatalf("扫码被用户取消.")
+		}
+		if s.State == client.QRCodeTimeout {
+			log.Fatalf("二维码过期")
+		}
+		if s.State == client.QRCodeWaitingForConfirm {
+			log.Infof("扫码成功, 请在手机端确认登录.")
+		}
+		if s.State == client.QRCodeConfirmed {
+			res, err := cli.QRCodeLogin(s.LoginInfo)
+			if err != nil {
+				return err
+			}
+			return loginResponseProcessor(res)
+		}
+	}
+}
+
+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("登录需要滑条验证码. ")
+			log.Warnf("请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <- 进行处理")
+			log.Warnf("1. 自行抓包并获取 Ticket 输入.")
+			log.Warnf("2. 使用手机QQ扫描二维码登入. (推荐)")
+			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
+			text = readLineTimeout(time.Second*10, "2")
+			if strings.Contains(text, "1") {
+				println()
+				log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
+				println()
+				log.Warn("请输入Ticket： (Enter 提交)")
+				text = readLine()
+				res, err = cli.SubmitTicket(text)
+				continue
+			}
+			return qrcodeLogin()
+		case client.NeedCaptcha:
+			log.Warnf("登录需要验证码.")
+			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
+			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

@@ -5,45 +5,54 @@ import (
 	"crypto/aes"
 	"crypto/md5"
 	"crypto/sha1"
-	"encoding/base64"
 	"encoding/hex"
+	"flag"
 	"fmt"
-	"github.com/Mrs4s/go-cqhttp/global/terminal"
-	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
-	easy "github.com/t-tomalak/logrus-easy-formatter"
-	"io"
 	"io/ioutil"
-	"net/http"
 	"os"
-	"os/exec"
 	"os/signal"
 	"path"
-	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	"github.com/Mrs4s/go-cqhttp/global/update"
 	"github.com/Mrs4s/go-cqhttp/server"
+
+	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/guonaihong/gout"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	log "github.com/sirupsen/logrus"
+	easy "github.com/t-tomalak/logrus-easy-formatter"
 	"github.com/tidwall/gjson"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/term"
-
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var (
-var conf *global.JSONConfig
+	conf        *config.Config
-var isFastStart = false
+	isFastStart = false
+	c           string
+	d           bool
+	h           bool
+)
 
 func init() {
+	var debug bool
+	flag.StringVar(&c, "c", config.DefaultConfigFile, "configuration filename default is config.hjson")
+	flag.BoolVar(&d, "d", false, "running as a daemon")
+	flag.BoolVar(&debug, "D", false, "debug mode")
+	flag.BoolVar(&h, "h", false, "this help")
+	flag.Parse()
+
+	// 通过-c 参数替换 配置文件路径
+	config.DefaultConfigFile = c
 	logFormatter := &easy.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05",
 		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
@@ -54,47 +63,23 @@ func init() {
 		panic(err)
 	}
 
-	conf = getConfig()
+	conf = config.Get()
 	if conf == nil {
-		os.Exit(1)
+		_ = os.WriteFile("config.yml", []byte(config.DefaultConfig), 0644)
+		log.Error("未找到配置文件，默认配置文件已生成!")
+		readLine()
+		os.Exit(0)
 	}
 
+	if debug {
+		conf.Output.Debug = true
+	}
 	// 在debug模式下,将在标准输出中打印当前执行行数
-	if conf.Debug {
+	if conf.Output.Debug {
 		log.SetReportCaller(true)
 	}
 
-	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
+	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...))
-
-	if global.PathExists("cqhttp.json") {
-		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
-		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
-		time.Sleep(time.Second * 5)
-		conf := global.CQHTTPAPIConfig{}
-		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
-			log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
-		}
-		goConf := global.DefaultConfig()
-		goConf.AccessToken = conf.AccessToken
-		goConf.HTTPConfig.Host = conf.Host
-		goConf.HTTPConfig.Port = conf.Port
-		goConf.WSConfig.Host = conf.WSHost
-		goConf.WSConfig.Port = conf.WSPort
-		if conf.PostURL != "" {
-			goConf.HTTPConfig.PostUrls[conf.PostURL] = conf.Secret
-		}
-		if conf.UseWsReverse {
-			goConf.ReverseServers[0].Enabled = true
-			goConf.ReverseServers[0].ReverseURL = conf.WSReverseURL
-			goConf.ReverseServers[0].ReverseAPIURL = conf.WSReverseAPIURL
-			goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
-			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
-		}
-		if err := goConf.Save("config.hjson"); err != nil {
-			log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		}
-		_ = os.Remove("cqhttp.json")
-	}
 
 	if !global.PathExists(global.ImagePath) {
 		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
@@ -119,6 +104,12 @@ func init() {
 }
 
 func main() {
+	if h {
+		help()
+	}
+	if d {
+		server.Daemon()
+	}
 	var byteKey []byte
 	arg := os.Args
 	if len(arg) > 1 {
@@ -132,8 +123,7 @@ func main() {
 				}
 			case "key":
 				if len(arg) > i+1 {
-					b := []byte(arg[i+1])
+					byteKey = []byte(arg[i+1])
-					byteKey = b
 				}
 			case "faststart":
 				isFastStart = true
@@ -145,23 +135,25 @@ func main() {
 		log.Warning("将等待10s后启动")
 		time.Sleep(time.Second * 10)
 	}
-	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
+
-		log.Warnf("请修改 config.hjson 以添加账号密码.")
+	if (conf.Account.Uin == 0 || (conf.Account.Password == "" && !conf.Account.Encrypt)) && !global.PathExists("session.token") {
+		log.Warn("账号密码未配置, 将使用二维码登录.")
 		if !isFastStart {
+			log.Warn("将在 5秒 后继续.")
 			time.Sleep(time.Second * 5)
 		}
-		return
 	}
 
 	log.Info("当前版本:", coolq.Version)
-	if conf.Debug {
+	if conf.Output.Debug {
 		log.SetLevel(log.DebugLevel)
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
-		server.Debug = true
+		/*
-		if conf.WebUI == nil || !conf.WebUI.Enabled {
+			if conf.WebUI == nil || !conf.WebUI.Enabled {
-			log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
+				log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
-		}
+			}
+		*/
 	}
 	log.Info("用户交流群: 721829413")
 	if !global.PathExists("device.json") {
@@ -175,52 +167,58 @@ func main() {
 			log.Fatalf("加载设备信息失败: %v", err)
 		}
 	}
-	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
+
-		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+	if conf.Account.Encrypt {
-		byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+		if !global.PathExists("password.encrypt") {
-		global.PasswordHash = md5.Sum([]byte(conf.Password))
+			if conf.Account.Password == "" {
-		conf.Password = ""
+				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
-		conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
+				readLine()
-		_ = conf.Save("config.hjson")
+				os.Exit(0)
-	}
+			}
-	if conf.PasswordEncrypted != "" {
+			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-		if len(byteKey) == 0 {
-			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
-			cancel := make(chan struct{}, 1)
-			go func() {
-				select {
-				case <-cancel:
-					return
-				case <-time.After(time.Second * 45):
-					log.Infof("解密key输入超时")
-					time.Sleep(3 * time.Second)
-					os.Exit(0)
-				}
-			}()
 			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			cancel <- struct{}{}
+			global.PasswordHash = md5.Sum([]byte(conf.Account.Password))
+			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(global.PasswordHash[:], byteKey)), 0644)
+			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+			readLine()
+			os.Exit(0)
 		} else {
-			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+			if conf.Account.Password != "" {
-		}
+				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+				readLine()
+				os.Exit(0)
+			}
 
-		// 升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
+			if len(byteKey) == 0 {
-		// 升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5
+				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
-		if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
+				cancel := make(chan struct{}, 1)
-			password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
+				state, _ := term.GetState(int(os.Stdin.Fd()))
-			passwordHash := md5.Sum([]byte(password))
+				go func() {
-			newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
+					select {
-			conf.PasswordEncrypted = "AES:" + newPasswordHash
+					case <-cancel:
-			_ = conf.Save("config.hjson")
+						return
-			log.Debug("密码加密方案升级完成")
+					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 取消.")
+			}
 
-		ph, err := PasswordHashDecrypt(conf.PasswordEncrypted[4:], byteKey)
+			encrypt, _ := os.ReadFile("password.encrypt")
-		if err != nil {
+			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
-			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+			if err != nil {
+				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+			}
+			copy(global.PasswordHash[:], ph)
 		}
-		copy(global.PasswordHash[:], ph)
 	} else {
-		global.PasswordHash = md5.Sum([]byte(conf.Password))
+		global.PasswordHash = md5.Sum([]byte(conf.Account.Password))
 	}
 	if !isFastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
@@ -240,7 +238,11 @@ func main() {
 		}
 		return "未知"
 	}())
-	cli := client.NewClientMd5(conf.Uin, global.PasswordHash)
+	cli = client.NewClientEmpty()
+	if conf.Account.Uin != 0 && global.PasswordHash != [16]byte{} {
+		cli.Uin = conf.Account.Uin
+		cli.PasswordMd5 = global.PasswordHash
+	}
 	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
 		switch e.Type {
 		case "INFO":
@@ -260,41 +262,143 @@ func main() {
 		log.Infof("读取到 %v 个自定义地址.", len(addr))
 	}
 	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !conf.UseSSOAddress {
+		if !conf.Account.UseSSOAddress {
 			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
 			return false
 		}
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
 		return true
 	})
-	if conf.WebUI == nil {
+	/*
-		conf.WebUI = &global.GoCQWebUI{
+		if conf.WebUI == nil {
-			Enabled:   true,
+			conf.WebUI = &global.GoCQWebUI{
-			WebInput:  false,
+				Enabled:   true,
-			Host:      "0.0.0.0",
+				WebInput:  false,
-			WebUIPort: 9999,
+				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"
+		}
+	*/
+	global.Proxy = conf.Message.ProxyRewrite
+	// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
+	// c := server.Console
+	isQRCodeLogin := (conf.Account.Uin == 0 || len(conf.Account.Password) == 0) && !conf.Account.Encrypt
+	isTokenLogin := false
+	if global.PathExists("session.token") {
+		token, err := ioutil.ReadFile("session.token")
+		if err == nil {
+			if err = cli.TokenLogin(token); err != nil {
+				_ = os.Remove("session.token")
+				log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
+			} else {
+				isTokenLogin = true
+			}
 		}
 	}
-	if conf.WebUI.WebUIPort <= 0 {
+	if !isTokenLogin {
-		conf.WebUI.WebUIPort = 9999
+		if !isQRCodeLogin {
+			if err := commonLogin(); err != nil {
+				log.Fatalf("登录时发生致命错误: %v", err)
+			}
+		} else {
+			if err := qrcodeLogin(); err != nil {
+				log.Fatalf("登录时发生致命错误: %v", err)
+			}
+		}
 	}
-	if conf.WebUI.Host == "" {
+	saveToken := func() {
-		conf.WebUI.Host = "127.0.0.1"
+		global.AccountToken = cli.GenToken()
+		_ = ioutil.WriteFile("session.token", global.AccountToken, 0677)
 	}
-	global.Proxy = conf.ProxyRewrite
+	saveToken()
-	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
+	var times uint = 1 // 重试次数
-	c := server.Console
+	var reLoginLock sync.Mutex
-	r := server.Restart
+	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
+		reLoginLock.Lock()
+		defer reLoginLock.Unlock()
+		log.Warnf("Bot已离线: %v", e.Message)
+		if conf.Account.ReLogin.Disabled {
+			os.Exit(1)
+		}
+		if times > conf.Account.ReLogin.MaxTimes && conf.Account.ReLogin.MaxTimes != 0 {
+			log.Fatalf("Bot重连次数超过限制, 停止")
+		}
+		if conf.Account.ReLogin.Interval > 0 {
+			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.Account.ReLogin.Interval, times, conf.Account.ReLogin.MaxTimes)
+		}
+		log.Warnf("尝试重连...")
+		if cli.Online {
+			return
+		}
+		if err := cli.TokenLogin(global.AccountToken); err == nil {
+			saveToken()
+			return
+		}
+		if isQRCodeLogin {
+			log.Fatalf("快速重连失败")
+		}
+		if err := commonLogin(); err != nil {
+			log.Fatalf("登录时发生致命错误: %v", err)
+		}
+	})
+	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))
+	bot := coolq.NewQQBot(cli, conf)
+	_ = bot.Client
+	if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
+		log.Warnf("post-format 配置错误, 将自动使用 string")
+		coolq.SetMessageFormat("string")
+	} else {
+		coolq.SetMessageFormat(conf.Message.PostFormat)
+	}
+	log.Info("正在加载事件过滤器.")
+	coolq.IgnoreInvalidCQCode = conf.Message.IgnoreInvalidCQCode
+	coolq.SplitURL = conf.Message.FixURL
+	coolq.ForceFragmented = conf.Message.ForceFragment
+	for _, m := range conf.Servers {
+		if h, ok := m["http"]; ok {
+			hc := new(config.HTTPServer)
+			if err := h.Decode(hc); err != nil {
+				log.Warn("读取http配置失败 :", err)
+			} else {
+				go server.RunHTTPServerAndClients(bot, hc)
+			}
+		}
+		if s, ok := m["ws"]; ok {
+			sc := new(config.WebsocketServer)
+			if err := s.Decode(sc); err != nil {
+				log.Warn("读取http配置失败 :", err)
+			} else {
+				go server.RunWebSocketServer(bot, sc)
+			}
+		}
+		if c, ok := m["ws-reverse"]; ok {
+			rc := new(config.WebsocketReverse)
+			if err := c.Decode(rc); err != nil {
+				log.Warn("读取http配置失败 :", err)
+			} else {
+				go server.RunWebSocketClient(bot, rc)
+			}
+		}
+	}
+	log.Info("资源初始化完成, 开始处理信息.")
+	log.Info("アトリは、高性能ですから!")
+	c := make(chan os.Signal, 1)
 	go checkUpdate()
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	select {
+	<-c
-	case <-c:
-		b.Release()
-	case <-r:
-		log.Info("正在重启中...")
-		defer b.Release()
-		restart(arg)
-	}
 }
 
 // PasswordHashEncrypt 使用key加密给定passwordHash
@@ -328,28 +432,9 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 	return result, nil
 }
 
-// OldPasswordDecrypt 使用key解密老password，仅供兼容使用
-func OldPasswordDecrypt(encryptedPassword string, key []byte) string {
-	defer func() {
-		if pan := recover(); pan != nil {
-			log.Fatalf("密码解密失败: %v", pan)
-		}
-	}()
-	encKey := md5.Sum(key)
-	encrypted, err := base64.StdEncoding.DecodeString(encryptedPassword)
-	if err != nil {
-		panic(err)
-	}
-	tea := binary.NewTeaCipher(encKey[:])
-	if tea == nil {
-		panic("密钥错误")
-	}
-	return string(tea.Decrypt(encrypted))
-}
-
 func checkUpdate() {
 	log.Infof("正在检查更新.")
-	if coolq.Version == "unknown" {
+	if coolq.Version == "(devel)" {
 		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
 		return
 	}
@@ -393,45 +478,31 @@ func selfUpdate(imageURL string) {
 		log.Info("当前最新版本为 ", version)
 		log.Warn("是否更新(y/N): ")
 		r := strings.TrimSpace(readLine())
-
+		if r != "y" && r != "Y" {
-		doUpdate := func() {
+			log.Warn("已取消更新！")
+		} else {
 			log.Info("正在更新,请稍等...")
 			url := fmt.Sprintf(
-				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
+				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp_%v_%v",
 				func() string {
 					if imageURL != "" {
 						return imageURL
 					}
 					return "https://github.com"
 				}(),
-				version,
+				version, runtime.GOOS, func() string {
-				version,
+					if runtime.GOARCH == "arm" {
-				runtime.GOOS,
+						return "armv7"
-				runtime.GOARCH,
+					}
+					return runtime.GOARCH
+				}(),
 			)
 			if runtime.GOOS == "windows" {
-				url = url + ".exe"
+				url += ".zip"
+			} else {
+				url += ".tar.gz"
 			}
-			resp, err := http.Get(url)
+			update.Update(url)
-			if err != nil {
-				fmt.Println(err)
-				log.Error("更新失败!")
-				return
-			}
-			wc := global.WriteCounter{}
-			err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
-			fmt.Println()
-			if err != nil {
-				log.Error("更新失败!")
-				return
-			}
-			log.Info("更新完成！")
-		}
-
-		if r == "y" || r == "Y" {
-			doUpdate()
-		} else {
-			log.Warn("已取消更新！")
 		}
 	} else {
 		log.Info("当前版本已经是最新版本!")
@@ -441,10 +512,11 @@ func selfUpdate(imageURL string) {
 	os.Exit(0)
 }
 
-func restart(Args []string) {
+/*
+func restart(args []string) {
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
-		file, err := exec.LookPath(Args[0])
+		file, err := exec.LookPath(args[0])
 		if err != nil {
 			log.Errorf("重启失败:%s", err.Error())
 			return
@@ -453,70 +525,38 @@ func restart(Args []string) {
 		if err != nil {
 			log.Errorf("重启失败:%s", err.Error())
 		}
-		Args = append([]string{"/c", "start ", path, "faststart"}, Args[1:]...)
+		args = append([]string{"/c", "start ", path, "faststart"}, args[1:]...)
 		cmd = &exec.Cmd{
 			Path:   "cmd.exe",
-			Args:   Args,
+			Args:   args,
 			Stderr: os.Stderr,
 			Stdout: os.Stdout,
 		}
 	} else {
-		Args = append(Args, "faststart")
+		args = append(args, "faststart")
 		cmd = &exec.Cmd{
-			Path:   Args[0],
+			Path:   args[0],
-			Args:   Args,
+			Args:   args,
 			Stderr: os.Stderr,
 			Stdout: os.Stdout,
 		}
 	}
 	_ = cmd.Start()
 }
+*/
 
-func getConfig() *global.JSONConfig {
+// help cli命令行-h的帮助提示
-	var conf *global.JSONConfig
+func help() {
-	if global.PathExists("config.json") {
+	fmt.Printf(`go-cqhttp service
-		conf = global.LoadConfig("config.json")
+version: %s
-		_ = conf.Save("config.hjson")
+
-		_ = os.Remove("config.json")
+Usage:
-	} else if os.Getenv("UIN") != "" {
+
-		log.Infof("将从环境变量加载配置.")
+server [OPTIONS]
-		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
+
-		pwd := os.Getenv("PASS")
+Options:
-		post := os.Getenv("HTTP_POST")
+`, coolq.Version)
-		conf = &global.JSONConfig{
+
-			Uin:      uin,
+	flag.PrintDefaults()
-			Password: pwd,
+	os.Exit(0)
-			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")
-		}
-	} else {
-		conf = global.LoadConfig("config.hjson")
-	}
-	if conf == nil {
-		err := global.WriteAllText("config.hjson", global.DefaultConfigWithComments)
-		if err != nil {
-			log.Fatalf("创建默认配置文件时出现错误: %v", err)
-			return nil
-		}
-		log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
-		if !isFastStart {
-			time.Sleep(time.Second * 5)
-		}
-		return nil
-	}
-	return conf
 }

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

@@ -2,10 +2,10 @@ package server
 
 import (
 	"strings"
-	"time"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+
 	"github.com/tidwall/gjson"
 )
 
@@ -13,8 +13,11 @@ type resultGetter interface {
 	Get(string) gjson.Result
 }
 
+type handler func(action string, p resultGetter) coolq.MSG
+
 type apiCaller struct {
-	bot *coolq.CQBot
+	bot      *coolq.CQBot
+	handlers []handler
 }
 
 func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
@@ -39,9 +42,10 @@ func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 
 func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetGroupMemberInfo(
-		p.Get("group_id").Int(), p.Get("user_id").Int(),
+		p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("no_cache").Bool(),
 	)
 }
+
 func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
 	if p.Get("message_type").Str == "private" {
@@ -191,18 +195,19 @@ func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
 }
 
-func setRestart(_ *coolq.CQBot, p resultGetter) coolq.MSG {
+func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.MSG {
-	var delay int64
+	/*
-	delay = p.Get("delay").Int()
+		var delay int64
-	if delay < 0 {
+		delay = p.Get("delay").Int()
-		delay = 0
+		if delay < 0 {
-	}
+			delay = 0
-	defer func(delay int64) {
+		}
-		time.Sleep(time.Duration(delay) * time.Millisecond)
+		defer func(delay int64) {
-		Restart <- struct{}{}
+			time.Sleep(time.Duration(delay) * time.Millisecond)
-	}(delay)
+			Restart <- struct{}{}
-	return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
+		}(delay)
-
+	*/
+	return coolq.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
 }
 
 func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
@@ -257,8 +262,9 @@ func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetVipInfo(p.Get("user_id").Int())
 }
 
-func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+func reloadEventFilter(_ *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQReloadEventFilter()
+	addFilter(p.Get("file").String())
+	return coolq.OK(nil)
 }
 
 func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
@@ -293,7 +299,7 @@ func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
 }
 
-func checkUrlSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+func checkURLSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQCheckURLSafely(p.Get("url").String())
 }
 
@@ -316,6 +322,7 @@ func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 }
 
+// API 是go-cqhttp当前支持的所有api的映射表
 var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"get_login_info":             getLoginInfo,
 	"get_friend_list":            getFriendList,
@@ -368,15 +375,30 @@ var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"set_essence_msg":            setEssenceMSG,
 	"delete_essence_msg":         deleteEssenceMSG,
 	"get_essence_msg_list":       getEssenceMsgList,
-	"check_url_safely":           checkUrlSafely,
+	"check_url_safely":           checkURLSafely,
 	"set_group_anonymous_ban":    setGroupAnonymousBan,
 	".handle_quick_operation":    handleQuickOperation,
 }
 
 func (api *apiCaller) callAPI(action string, p resultGetter) coolq.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)
-	} else {
+	}
-		return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
+	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,662 +0,0 @@
-package server
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
-	"fmt"
-	"image"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/gin-contrib/pprof"
-
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/gin-gonic/gin"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	asciiart "github.com/yinghau76/go-ascii-art"
-)
-
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
-// WebInput 网页输入channel
-var WebInput = make(chan string, 1) //长度1，用于阻塞
-
-// Console 控制台channel
-var Console = make(chan os.Signal, 1)
-
-// Restart 重启信号监听channel
-var Restart = make(chan struct{}, 1)
-
-// JSONConfig go-cqhttp配置
-var JSONConfig *global.JSONConfig
-
-type webServer struct {
-	engine  *gin.Engine
-	bot     *coolq.CQBot
-	Cli     *client.QQClient
-	Conf    *global.JSONConfig //old config
-	Console *bufio.Reader
-}
-
-// WebServer Admin子站的Server
-var WebServer = &webServer{}
-
-// APIAdminRoutingTable Admin子站的路由映射
-var APIAdminRoutingTable = map[string]func(s *webServer, c *gin.Context){
-	"do_restart":         AdminDoRestart,         //热重启
-	"do_process_restart": AdminProcessRestart,    //进程重启
-	"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":  AdminDoConfigReverseWS, //修改config.json 中的反向ws部分
-	"do_config_json":     AdminDoConfigJSON,      //直接修改 config.json配置
-	"get_config_json":    AdminGetConfigJSON,     //拉取 当前的config.json配置
-}
-
-// Failed 构建失败返回MSG
-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 != nil && s.Conf.WebUI.Enabled {
-			if Debug {
-				pprof.Register(s.engine)
-				log.Debugf("pprof 性能分析服务已启动在 http://%v/debug/pprof, 如果有任何性能问题请下载报告并提交给开发者", addr)
-				time.Sleep(time.Second * 3)
-			}
-			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, syscall.SIGTERM)
-				<-c
-				os.Exit(1)
-			}
-		} else {
-			// 关闭端口监听
-			c := make(chan os.Signal, 1)
-			signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-			<-c
-			os.Exit(1)
-		}
-	}()
-	s.Dologin()
-	s.UpServer()
-	b := s.bot // 外部引入 bot对象，用于操作bot
-	return b
-}
-
-// logincore 登录核心实现
-func (s *webServer) logincore(relogin bool) {
-
-	s.Console = bufio.NewReader(os.Stdin)
-	readLine := func() (str string) {
-		str, _ = s.Console.ReadString('\n')
-		str = strings.TrimSpace(str)
-		return
-	}
-
-	if s.Cli.Online {
-		log.Warn("Bot已登录")
-		return
-	}
-
-	var times uint = 1 // 重试次数
-	for res, err := s.Cli.Login(); ; res, err = s.Cli.Login() {
-
-		var text string
-		count := 0
-
-		if res == nil {
-			goto Relogin
-		}
-
-	Again: // 不执行 s.Cli.Login() 的循环，适用输入验证码等更新 res 的操作
-		if err == nil && res.Success { // 登录成功
-			break
-		} else if err == client.ErrAlreadyOnline {
-			break
-		}
-
-		switch res.Error {
-		case client.SliderNeededError:
-			log.Warnf("登录需要滑条验证码, 请选择解决方案: ")
-			log.Warnf("1. 自行抓包. (推荐)")
-			log.Warnf("2. 使用Cef自动处理.")
-			log.Warnf("3. 不提交滑块并继续.(可能会导致上网环境异常错误)")
-			log.Warnf("详细信息请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <-")
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Warnf("请输入(1 - 3)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-				text = <-WebInput
-			} else {
-				log.Warn("请输入(1 - 3)：")
-				text = readLine()
-			}
-			if strings.Contains(text, "1") {
-				log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
-				if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-					log.Warnf("请输入Ticket： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-					text = <-WebInput
-				} else {
-					log.Warn("请输入Ticket： (Enter 提交)")
-					text = readLine()
-				}
-				res, err = s.Cli.SubmitTicket(strings.TrimSpace(text))
-				goto Again
-			}
-			if strings.Contains(text, "3") {
-				s.Cli.AllowSlider = false
-				s.Cli.Disconnect()
-				continue
-			}
-			id := utils.RandomStringRange(6, "0123456789")
-			log.Warnf("滑块ID为 %v 请在30S内处理.", id)
-			ticket, err := global.GetSliderTicket(res.VerifyUrl, id)
-			if err != nil {
-				log.Warnf("错误: " + err.Error())
-				os.Exit(0)
-			}
-			res, err = s.Cli.SubmitTicket(ticket)
-			if err != nil {
-				log.Warnf("错误: " + err.Error())
-				continue // 尝试重新登录
-			}
-			goto Again
-		case client.NeedCaptcha:
-			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
-			img, _, _ := image.Decode(bytes.NewReader(res.CaptchaImage))
-			fmt.Println(asciiart.New("image", img).Art)
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-				text = <-WebInput
-			} else {
-				log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
-				text = readLine()
-			}
-			global.DelFile("captcha.jpg")
-			res, err = s.Cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), res.CaptchaSign)
-			goto Again
-		case client.SMSNeededError:
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Warnf("账号已开启设备锁, 已向手机 %v 发送短信验证码.", res.SMSPhone)
-			} else {
-				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
-				readLine()
-			}
-			if !s.Cli.RequestSMS() {
-				log.Warnf("发送验证码失败，可能是请求过于频繁.")
-				time.Sleep(time.Second * 5)
-				continue
-			}
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Warnf("请输入短信验证码： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-				text = <-WebInput
-			} else {
-				log.Warn("请输入短信验证码： (Enter 提交)")
-				text = readLine()
-			}
-			res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
-			goto Again
-		case client.SMSOrVerifyNeededError:
-			log.Warnf("账号已开启设备锁，请选择验证方式:")
-			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
-			log.Warnf("2. 使用手机QQ扫码验证.")
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Warnf("请输入(1 - 2)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-				text = <-WebInput
-			} else {
-				log.Warn("请输入(1 - 2)：")
-				text = readLine()
-			}
-			if strings.Contains(text, "1") {
-				if !s.Cli.RequestSMS() {
-					log.Warnf("发送验证码失败，可能是请求过于频繁.")
-					time.Sleep(time.Second * 5)
-					os.Exit(0)
-				}
-				if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-					log.Warnf("请输入短信验证码：  (http://%s:%d/admin/do_web_write 输入)....", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-					text = <-WebInput
-				} else {
-					log.Warn("请输入短信验证码： (Enter 提交)")
-					text = readLine()
-				}
-				res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
-				goto Again
-			}
-			log.Warnf("请前往 -> %v <- 验证.", res.VerifyUrl)
-			log.Infof("按 Enter 继续....")
-			readLine()
-			continue
-		case client.UnsafeDeviceError:
-			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证.", res.VerifyUrl)
-			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-				log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
-				text = <-WebInput
-			} else {
-				log.Infof("按 Enter 继续....")
-				readLine()
-			}
-			log.Info(text)
-			continue
-		case client.OtherLoginError, client.UnknownLoginError:
-			msg := res.ErrorMessage
-			if strings.Contains(msg, "版本") {
-				msg = "密码错误或账号被冻结"
-			}
-			if strings.Contains(msg, "上网环境") && count < 5 {
-				s.Cli.Disconnect()
-				log.Warnf("错误: 当前上网环境异常. 将更换服务器并重试.")
-				count++
-				time.Sleep(time.Second)
-				continue
-			}
-			if strings.Contains(msg, "冻结") {
-				log.Fatalf("账号被冻结, 放弃重连")
-			}
-			log.Warnf("登录失败: %v", msg)
-			log.Infof("按 Enter 继续....")
-			readLine()
-			os.Exit(0)
-		}
-
-	Relogin:
-		if relogin {
-			if times > s.Conf.ReLogin.MaxReloginTimes && s.Conf.ReLogin.MaxReloginTimes != 0 {
-				log.Fatal("重连失败: 重连次数达到设置的上限值")
-				s.bot.Release()
-				return
-			}
-			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v", s.Conf.ReLogin.ReLoginDelay, times)
-			times++
-			time.Sleep(time.Second * time.Duration(s.Conf.ReLogin.ReLoginDelay))
-			s.Cli.Disconnect()
-			continue
-		}
-	}
-	if relogin {
-		log.Info("重连成功")
-	}
-}
-
-// Dologin 主程序登录
-func (s *webServer) Dologin() {
-
-	s.Cli.AllowSlider = true
-	s.logincore(false)
-	log.Infof("登录成功 欢迎使用: %v", s.Cli.Nickname)
-	log.Info("开始加载好友列表...")
-	global.Check(s.Cli.ReloadFriendList())
-	log.Infof("共加载 %v 个好友.", len(s.Cli.FriendList))
-	log.Infof("开始加载群列表...")
-	global.Check(s.Cli.ReloadGroupList())
-	log.Infof("共加载 %v 个群.", len(s.Cli.GroupList))
-	s.bot = coolq.NewQQBot(s.Cli, s.Conf)
-	if s.Conf.PostMessageFormat != "string" && s.Conf.PostMessageFormat != "array" {
-		log.Warnf("post_message_format 配置错误, 将自动使用 string")
-		coolq.SetMessageFormat("string")
-	} else {
-		coolq.SetMessageFormat(s.Conf.PostMessageFormat)
-	}
-	if s.Conf.RateLimit.Enabled {
-		global.InitLimiter(s.Conf.RateLimit.Frequency, s.Conf.RateLimit.BucketSize)
-	}
-	log.Info("正在加载事件过滤器.")
-	global.BootFilter()
-	coolq.IgnoreInvalidCQCode = s.Conf.IgnoreInvalidCQCode
-	coolq.SplitURL = s.Conf.FixURL
-	coolq.ForceFragmented = s.Conf.ForceFragmented
-	log.Info("资源初始化完成, 开始处理信息.")
-	log.Info("アトリは、高性能ですから!")
-
-	s.Cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
-		if !s.Conf.ReLogin.Enabled {
-			return
-		}
-		log.Warnf("Bot已离线 (%v)，尝试重连", e.Message)
-		s.logincore(true)
-	})
-}
-
-func (s *webServer) admin(c *gin.Context) {
-	action := c.Param("action")
-	log.Debugf("WebServer接收到cgi调用: %v", action)
-	if f, ok := APIAdminRoutingTable[action]; ok {
-		f(s, c)
-	} else {
-		c.JSON(200, coolq.Failed(404))
-	}
-}
-
-// GetConf 获取当前配置文件信息
-func GetConf() *global.JSONConfig {
-	if JSONConfig != nil {
-		return JSONConfig
-	}
-	conf := global.LoadConfig("config.hjson")
-	return conf
-}
-
-// AuthMiddleWare 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 strings.Contains(c.Request.URL.Path, "debug") {
-			c.Next()
-			return
-		}
-		// 处理请求
-		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 {
-		cqHTTPServer.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 cqHTTPServer.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 cqHTTPServer.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()
-	}
-}
-
-// AdminDoRestart 热重启
-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{}))
-}
-
-// AdminProcessRestart 进程重启
-func AdminProcessRestart(s *webServer, c *gin.Context) {
-	Restart <- struct{}{}
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-}
-
-// AdminDoRestartDocker 冷重启
-func AdminDoRestartDocker(s *webServer, c *gin.Context) {
-	Console <- os.Kill
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-}
-
-// AdminWebWrite 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上显示图片
-	}))
-}
-
-// AdminDoWebWrite web输入处理
-func AdminDoWebWrite(s *webServer, c *gin.Context) {
-	input := c.PostForm("input")
-	WebInput <- input
-	c.JSON(200, coolq.OK(coolq.MSG{}))
-}
-
-// AdminDoConfigBase 普通配置修改
-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.hjson"); err != nil {
-		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JSONConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// AdminDoConfigHTTP 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.hjson"); err != nil {
-		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JSONConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// AdminDoConfigWS 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.hjson"); err != nil {
-		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JSONConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// AdminDoConfigReverseWS 反向ws配置修改
-func AdminDoConfigReverseWS(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.hjson"); err != nil {
-		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JSONConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// AdminDoConfigJSON config.hjson配置修改
-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.hjson", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-		return
-	}
-	if err := conf.Save("config.hjson"); err != nil {
-		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
-		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
-	} else {
-		JSONConfig = nil
-		c.JSON(200, coolq.OK(coolq.MSG{}))
-	}
-}
-
-// AdminGetConfigJSON 拉取config.hjson配置
-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

@@ -1,2 +1,2 @@
-// Package server 包含Admin子站,HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
+// Package server 包含HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
 package server

server/http.go

@@ -1,17 +1,21 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
+	"fmt"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/config"
+
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
 	"github.com/guonaihong/gout/dataflow"
@@ -23,13 +27,15 @@ type httpServer struct {
 	engine *gin.Engine
 	bot    *coolq.CQBot
 	HTTP   *http.Server
-	api    apiCaller
+	api    *apiCaller
 }
 
-type httpClient struct {
+// HTTPClient 反向HTTP上报客户端
+type HTTPClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
+	filter  string
 	timeout int32
 }
 
@@ -37,16 +43,23 @@ type httpContext struct {
 	ctx *gin.Context
 }
 
-var cqHTTPServer = &httpServer{}
+// RunHTTPServerAndClients 启动HTTP服务器与HTTP上报客户端
-
+func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
-// Debug 是否启用Debug模式
+	if conf.Disabled {
-var Debug = false
+		return
-
+	}
-func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
+	var (
+		s         = new(httpServer)
+		authToken = conf.AccessToken
+		addr      = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	)
 	gin.SetMode(gin.ReleaseMode)
 	s.engine = gin.New()
 	s.bot = bot
-	s.api = apiCaller{s.bot}
+	s.api = newAPICaller(s.bot)
+	if conf.RateLimit.Enabled {
+		s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+	}
 	s.engine.Use(func(c *gin.Context) {
 		if c.Request.Method != "GET" && c.Request.Method != "POST" {
 			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
@@ -72,15 +85,16 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 
 	if authToken != "" {
 		s.engine.Use(func(c *gin.Context) {
-			if auth := c.Request.Header.Get("Authorization"); auth != "" {
+			auth := c.Request.Header.Get("Authorization")
+			switch {
+			case auth != "":
 				if strings.SplitN(auth, " ", 2)[1] != authToken {
 					c.AbortWithStatus(401)
-					return
 				}
-			} else if c.Query("access_token") != authToken {
+			case c.Query("access_token") != authToken:
 				c.AbortWithStatus(401)
 				return
-			} else {
+			default:
 				c.Next()
 			}
 		})
@@ -102,17 +116,27 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 			os.Exit(1)
 		}
 	}()
+
+	for _, c := range conf.Post {
+		if c.URL != "" {
+			go newHTTPClient().Run(c.URL, c.Secret, conf.Filter, conf.Timeout, bot)
+		}
+	}
 }
 
-func newHTTPClient() *httpClient {
+// newHTTPClient 返回反向HTTP客户端
-	return &httpClient{}
+func newHTTPClient() *HTTPClient {
+	return &HTTPClient{}
 }
 
-func (c *httpClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
+// Run 运行反向HTTP服务
+func (c *HTTPClient) Run(addr, secret, filter string, timeout int32, bot *coolq.CQBot) {
 	c.bot = bot
 	c.secret = secret
 	c.addr = addr
 	c.timeout = timeout
+	c.filter = filter
+	addFilter(filter)
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
@@ -120,16 +144,24 @@ func (c *httpClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
 	log.Infof("HTTP POST上报器已启动: %v", addr)
 }
 
-func (c *httpClient) onBotPushEvent(m coolq.MSG) {
+func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
 	var res string
-	err := gout.POST(c.addr).SetJSON(m).BindBody(&res).SetHeader(func() gout.H {
+	if c.filter != "" {
+		filter := findFilter(c.filter)
+		if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
+			log.Debugf("上报Event %v 到 HTTP 服务器 %v 时被过滤.", c.addr, utils.B2S(m.Bytes()))
+			return
+		}
+	}
+
+	err := gout.POST(c.addr).SetJSON(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
 		h := gout.H{
 			"X-Self-ID":  c.bot.Client.Uin,
 			"User-Agent": "CQHttp/4.15.0",
 		}
 		if c.secret != "" {
 			mac := hmac.New(sha1.New, []byte(c.secret))
-			_, err := mac.Write([]byte(m.ToJSON()))
+			_, err := mac.Write(m.Bytes())
 			if err != nil {
 				log.Error(err)
 				return nil
@@ -147,17 +179,16 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 			return nil
 		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJSON(), c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %v 到 %v", m.ToJSON(), c.addr)
+	log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
 	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJSON()), gjson.Parse(res))
+		c.bot.CQHandleQuickOperation(gjson.Parse(utils.B2S(m.Bytes())), gjson.Parse(res))
 	}
 }
 
 func (s *httpServer) HandleActions(c *gin.Context) {
-	global.RateLimit(context.Background())
 	action := strings.ReplaceAll(c.Param("action"), "_async", "")
 	log.Debugf("HTTPServer接收到API调用: %v", action)
 	c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))

server/middlewares.go

@@ -0,0 +1,56 @@
+package server
+
+import (
+	"context"
+	"os"
+	"sync"
+
+	"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) coolq.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]
+}

server/websocket.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"context"
+	"bytes"
 	"fmt"
 	"net/http"
 	"runtime/debug"
@@ -12,48 +12,62 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/config"
+
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
 type webSocketServer struct {
-	bot            *coolq.CQBot
+	bot  *coolq.CQBot
-	token          string
+	conf *config.WebsocketServer
+
 	eventConn      []*webSocketConn
 	eventConnMutex sync.Mutex
+	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
 	eventConn     *webSocketConn
+	token         string
+	filter        string
 }
 
 type webSocketConn struct {
 	*websocket.Conn
 	sync.Mutex
-	apiCaller apiCaller
+	apiCaller *apiCaller
 }
 
-// WebSocketServer 初始化一个WebSocketServer实例
-var WebSocketServer = &webSocketServer{}
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool {
 		return true
 	},
 }
 
-func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
+// RunWebSocketServer 运行一个正向WS server
-	s.token = authToken
+func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
+	if conf.Disabled {
+		return
+	}
+	s := new(webSocketServer)
+	s.conf = conf
 	s.bot = b
+	s.token = conf.AccessToken
+	s.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)
 	http.HandleFunc("/api", s.api)
@@ -64,23 +78,24 @@ func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 	}()
 }
 
-// NewWebSocketClient 初始化一个NWebSocket客户端
+// RunWebSocketClient 运行一个正向WS client
-func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
+func RunWebSocketClient(b *coolq.CQBot, conf *config.WebsocketReverse) {
-	return &WebSocketClient{conf: conf, token: authToken, bot: b}
+	if conf.Disabled {
-}
-
-// Run 运行实例
-func (c *WebSocketClient) Run() {
-	if !c.conf.Enabled {
 		return
 	}
-	if c.conf.ReverseURL != "" {
+	c := new(WebSocketClient)
+	c.bot = b
+	c.conf = conf
+	c.token = conf.AccessToken
+	c.filter = conf.Filter
+	addFilter(c.filter)
+	if c.conf.Universal != "" {
 		c.connectUniversal()
 	} else {
-		if c.conf.ReverseAPIURL != "" {
+		if c.conf.API != "" {
 			c.connectAPI()
 		}
-		if c.conf.ReverseEventURL != "" {
+		if c.conf.Event != "" {
 			c.connectEvent()
 		}
 	}
@@ -88,7 +103,7 @@ func (c *WebSocketClient) Run() {
 }
 
 func (c *WebSocketClient) connectAPI() {
-	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
+	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.API)
 	header := http.Header{
 		"X-Client-Role": []string{"API"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -97,22 +112,25 @@ func (c *WebSocketClient) connectAPI() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.API, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
+		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", 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()
 		}
 		return
 	}
-	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
+	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.API)
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	if c.conf.RateLimit.Enabled {
+		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
+	}
 	go c.listenAPI(wrappedConn, false)
 }
 
 func (c *WebSocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
+	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.Event)
 	header := http.Header{
 		"X-Client-Role": []string{"Event"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -121,11 +139,11 @@ func (c *WebSocketClient) connectEvent() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Event, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
+		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.Event, 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.connectEvent()
 		}
 		return
@@ -138,12 +156,12 @@ func (c *WebSocketClient) connectEvent() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
+	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
-	c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
+	c.eventConn = &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
 }
 
 func (c *WebSocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
+	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.Universal)
 	header := http.Header{
 		"X-Client-Role": []string{"Universal"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -152,16 +170,15 @@ func (c *WebSocketClient) connectUniversal() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Universal, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
+		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.Universal, 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.connectUniversal()
 		}
 		return
 	}
-
 	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
 		c.bot.Client.Uin, time.Now().Unix())
 	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
@@ -169,58 +186,78 @@ func (c *WebSocketClient) connectUniversal() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	if c.conf.RateLimit.Enabled {
+		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
+	}
 	go c.listenAPI(wrappedConn, true)
 	c.universalConn = wrappedConn
 }
 
 func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
-	defer conn.Close()
+	defer func() { _ = conn.Close() }()
 	for {
-		_, buf, err := conn.ReadMessage()
+		buffer := global.NewBuffer()
+		t, reader, err := conn.NextReader()
 		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.TextMessage {
+			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()
 		}
 	}
 }
 
-func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
+func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
+	filter := findFilter(c.filter)
+	if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
+		log.Debugf("上报Event %v 到 WS客户端 时被过滤.", utils.B2S(m.Bytes()))
+		return
+	}
+
 	if c.eventConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJSON())
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
 		conn := c.eventConn
 		conn.Lock()
 		defer conn.Unlock()
 		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := c.eventConn.WriteJSON(m); err != nil {
+		if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
 			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
 			_ = c.eventConn.Close()
-			if c.conf.ReverseReconnectInterval != 0 {
+			if c.conf.ReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
 				c.connectEvent()
 			}
 		}
 	}
 	if c.universalConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJSON())
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
 		conn := c.universalConn
 		conn.Lock()
 		defer conn.Unlock()
 		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := c.universalConn.WriteJSON(m); err != nil {
+		if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
 			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
 			_ = c.universalConn.Close()
-			if c.conf.ReverseReconnectInterval != 0 {
+			if c.conf.ReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
 				c.connectUniversal()
 			}
 		}
@@ -228,7 +265,7 @@ func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
 }
 
 func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
-	if s.token != "" {
+	if s.conf.AccessToken != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
 				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
@@ -245,13 +282,13 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		c.Close()
+		_ = c.Close()
 		return
 	}
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
+	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
 
 	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
@@ -274,7 +311,10 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
+	conn := &webSocketConn{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)
 }
 
@@ -296,25 +336,40 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		c.Close()
+		_ = c.Close()
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
+	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	if s.conf.RateLimit.Enabled {
+		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+	}
+	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
+	s.eventConnMutex.Unlock()
 	s.listenAPI(conn)
 }
 
 func (s *webSocketServer) listenAPI(c *webSocketConn) {
-	defer c.Close()
+	defer func() { _ = c.Close() }()
 	for {
-		t, payload, err := c.ReadMessage()
+		buffer := global.NewBuffer()
+		t, reader, err := c.NextReader()
+		if err != nil {
+			break
+		}
+		_, err = buffer.ReadFrom(reader)
 		if err != nil {
 			break
 		}
 
 		if t == websocket.TextMessage {
-			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)
 		}
 	}
 }
@@ -323,10 +378,9 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
-			c.Close()
+			_ = c.Close()
 		}
 	}()
-	global.RateLimit(context.Background())
 	j := gjson.ParseBytes(payload)
 	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
@@ -339,14 +393,21 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	_ = c.WriteJSON(ret)
 }
 
-func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
+func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
 	s.eventConnMutex.Lock()
 	defer s.eventConnMutex.Unlock()
+
+	filter := findFilter(s.filter)
+	if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
+		log.Debugf("上报Event %v 到 WS客户端 时被过滤.", utils.B2S(m.Bytes()))
+		return
+	}
+
 	for i, l := 0, len(s.eventConn); i < l; i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJSON())
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
 		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJSON())); err != nil {
+		if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
 			_ = conn.Close()
 			next := i + 1
 			if next >= l {