upload to dist

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request,workflow_dispatch]
+on: [push, pull_request]
 
 env:
   BINARY_PREFIX: "go-cqhttp_"
@@ -31,13 +31,6 @@ jobs:
         uses: actions/setup-go@v2.1.3
         with:
           go-version: 1.16
-      - name: Cache downloaded module
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}
       - name: Build binary file
         env:
           GOOS: ${{ matrix.goos }}

.github/workflows/golint.yml

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

.github/workflows/release.yml

@@ -27,15 +27,22 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      #- name: Checkout Dist
+      - name: Checkout Dist
-      #  uses: actions/checkout@v2
+        uses: actions/checkout@v2
-      #  with:
+        with:
-      #    repository: 'gocq/dist'
+          repository: 'wdvxdr1123/dist'
-      #    ref: master
+          ref: master
-      #    ssh-key: ${{ secrets.SSH_KEY }}
+          ssh-key: ${{ secrets.SSH_KEY }}
-      #    path: upstream/dist
+          path: upstream/dist
+
+      - name: Update Dist
+        run: |
+          cp dist/*.tar.gz upstream/dist/
+          cp dist/*.zip upstream/dist/
+          cd upstream/dist
+          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 ${GITHUB_REF#"refs/tags/"}"
+          git push
 
-      #- name: Update Dist
-      #  run: |
-      #    chmod +x scripts/upload_dist.sh
-      #    ./scripts/upload_dist.sh

.github/workflows/suggester.yml

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

.gitignore

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

.golangci.yml

@@ -40,7 +40,7 @@ linters:
     - gosimple
     - govet
     - ineffassign
-    #- misspell
+    - misspell
     - nolintlint
     - rowserrcheck
     - staticcheck
@@ -82,7 +82,7 @@ run:
 
 # output configuration options
 output:
-  format: "colored-line-number"
+  format: 'colored-line-number'
   print-issued-lines: true
   print-linter-name: true
   uniq-by-line: true
@@ -90,6 +90,3 @@ output:
 issues:
   # Fix found issues (if it's supported by the linter)
   fix: true
-  exclude-use-default: false
-  exclude:
-    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"

.goreleaser.yml

@@ -4,13 +4,13 @@ before:
   hooks:
     - go mod tidy
 builds:
-  - id: nowin
+  - env:
-    env:
       - CGO_ENABLED=0
       - GO111MODULE=on
     goos:
       - linux
       - darwin
+      - windows
     goarch:
       - 386
       - amd64
@@ -23,37 +23,22 @@ builds:
         goarch: arm
       - goos: darwin
         goarch: 386
-    mod_timestamp: "{{ .CommitTimestamp }}"
+      - goos: windows
-    flags:
+        goarch: arm64
-      - -trimpath
+    mod_timestamp: '{{ .CommitTimestamp }}'
-    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"
+  name_template: '{{ .ProjectName }}_checksums.txt'
 changelog:
   sort: asc
   filters:
     exclude:
-      - "^docs:"
+      - '^docs:'
-      - "^test:"
+      - '^test:'
       - fix typo
       - Merge pull request
       - Merge branch
@@ -61,18 +46,7 @@ changelog:
       - go mod tidy
 
 archives:
-  - id: binary
+  - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
-    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
@@ -80,8 +54,7 @@ archives:
 nfpms:
   - license: AGPL 3.0
     homepage: https://go-cqhttp.org
-    file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     formats:
       - deb
       - rpm
-    maintainer: Mrs4s

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine AS builder
+FROM golang:1.15.5-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \

README.md

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

coolq/api.go

@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
+	"io/ioutil"
 	"math"
 	"os"
 	"path"
@@ -14,13 +15,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/global"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-
-	"github.com/Mrs4s/go-cqhttp/global"
 )
 
 // Version go-cqhttp的版本信息，在编译时使用ldflags进行覆盖
@@ -43,18 +44,6 @@ func (bot *CQBot) CQGetLoginInfo() MSG {
 	return OK(MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname})
 }
 
-// CQGetQiDianAccountInfo 获取企点账号信息
-func (bot *CQBot) CQGetQiDianAccountInfo() MSG {
-	if bot.Client.QiDian == nil {
-		return Failed(100, "QIDIAN_PROTOCOL_REQUEST", "请使用企点协议")
-	}
-	return OK(MSG{
-		"master_id":   bot.Client.QiDian.MasterUin,
-		"ext_name":    bot.Client.QiDian.ExtName,
-		"create_time": bot.Client.QiDian.CreateTime,
-	})
-}
-
 // CQGetFriendList 获取好友列表
 //
 // https://git.io/Jtz1L
@@ -70,20 +59,6 @@ func (bot *CQBot) CQGetFriendList() MSG {
 	return OK(fs)
 }
 
-// CQDeleteFriend 删除好友
-//
-//
-func (bot *CQBot) CQDeleteFriend(uin int64) MSG {
-	if bot.Client.FindFriend(uin) == nil {
-		return Failed(100, "FRIEND_NOT_FOUND", "好友不存在")
-	}
-	if err := bot.Client.DeleteFriend(uin); err != nil {
-		log.Errorf("删除好友时出现错误: %v", err)
-		return Failed(100, "DELETE_API_ERROR", err.Error())
-	}
-	return OK(nil)
-}
-
 // CQGetGroupList 获取群列表
 //
 // https://git.io/Jtz1t
@@ -94,13 +69,10 @@ func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
 	}
 	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,
-			"group_memo":        g.Memo,
+			"max_member_count": g.MaxMemberCount,
-			"group_create_time": g.GroupCreateTime,
+			"member_count":     g.MemberCount,
-			"group_level":       g.GroupLevel,
-			"max_member_count":  g.MaxMemberCount,
-			"member_count":      g.MemberCount,
 		})
 	}
 	return OK(gs)
@@ -111,9 +83,6 @@ 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)
@@ -123,28 +92,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,
-					"group_memo":        g.Memo,
+					"max_member_count": 0,
-					"group_create_time": 0,
+					"member_count":     0,
-					"group_level":       0,
-					"max_member_count":  0,
-					"member_count":      0,
 				})
 			}
 		}
-	} else {
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在失败")
-		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,
-		})
 	}
-	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+	if noCache {
+		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 获取群成员列表
@@ -173,22 +142,12 @@ func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) MSG {
 // CQGetGroupMemberInfo 获取群成员信息
 //
 // https://git.io/Jtz1s
-func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64, noCache bool) MSG {
+func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64) MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
 		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
-	var member *client.GroupMemberInfo
+	member := group.FindMember(userID)
-	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", "群员不存在")
 	}
@@ -283,54 +242,6 @@ func (bot *CQBot) CQUploadGroupFile(groupID int64, file, name, folder string) MS
 	return OK(nil)
 }
 
-// CQGroupFileCreateFolder 拓展API-创建群文件文件夹
-//
-//
-func (bot *CQBot) CQGroupFileCreateFolder(groupID int64, parentID, name string) MSG {
-	fs, err := bot.Client.GetGroupFileSystem(groupID)
-	if err != nil {
-		log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
-		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
-	}
-	if err = fs.CreateFolder(parentID, name); err != nil {
-		log.Errorf("创建群 %v 文件夹失败: %v", groupID, err)
-		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
-	}
-	return OK(nil)
-}
-
-// CQGroupFileDeleteFolder 拓展API-删除群文件文件夹
-//
-//
-func (bot *CQBot) CQGroupFileDeleteFolder(groupID int64, id string) MSG {
-	fs, err := bot.Client.GetGroupFileSystem(groupID)
-	if err != nil {
-		log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
-		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
-	}
-	if err = fs.DeleteFolder(id); err != nil {
-		log.Errorf("删除群 %v 文件夹 %v 时出现文件: %v", groupID, id, err)
-		return Failed(200, "FILE_SYSTEM_API_ERROR", err.Error())
-	}
-	return OK(nil)
-}
-
-// CQGroupFileDeleteFile 拓展API-删除群文件
-//
-//
-func (bot *CQBot) CQGroupFileDeleteFile(groupID int64, id string, busID int32) MSG {
-	fs, err := bot.Client.GetGroupFileSystem(groupID)
-	if err != nil {
-		log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
-		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
-	}
-	if res := fs.DeleteFile("", id, busID); res != "" {
-		log.Errorf("删除群 %v 文件 %v 时出现文件: %v", groupID, id, res)
-		return Failed(200, "FILE_SYSTEM_API_ERROR", res)
-	}
-	return OK(nil)
-}
-
 // CQGetWordSlices 隐藏API-获取中文分词
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D-%E9%9A%90%E8%97%8F-api
@@ -348,37 +259,47 @@ func (bot *CQBot) CQGetWordSlices(content string) MSG {
 // CQSendGroupMessage 发送群消息
 //
 // https://git.io/Jtz1c
-func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape bool) MSG {
+func (bot *CQBot) CQSendGroupMessage(groupID int64, i interface{}, autoEscape bool) MSG {
+	var str string
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
 		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
 	fixAt := func(elem []message.IMessageElement) {
 		for _, e := range elem {
-			if at, ok := e.(*message.AtElement); ok && at.Target != 0 && at.Display == "" {
+			if at, ok := e.(*message.AtElement); ok && at.Target != 0 {
-				mem := group.FindMember(at.Target)
+				at.Display = "@" + func() string {
-				if mem != nil {
+					mem := group.FindMember(at.Target)
-					at.Display = "@" + mem.DisplayName()
+					if mem != nil {
-				} else {
+						return mem.DisplayName()
-					at.Display = "@" + strconv.FormatInt(at.Target, 10)
+					}
-				}
+					return strconv.FormatInt(at.Target, 10)
+				}()
 			}
 		}
 	}
-
+	if m, ok := i.(gjson.Result); ok {
-	if m.Type == gjson.JSON {
+		if m.Type == gjson.JSON {
-		elem := bot.ConvertObjectMessage(m, true)
+			elem := bot.ConvertObjectMessage(m, true)
-		fixAt(elem)
+			fixAt(elem)
-		mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
+			mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
-		if mid == -1 {
+			if mid == -1 {
-			return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
+			}
+			log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
+			return OK(MSG{"message_id": mid})
 		}
-		log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(ToStringMessage(elem, groupID)), mid)
+		str = func() string {
-		return OK(MSG{"message_id": mid})
+			if m.Str != "" {
+				return m.Str
+			}
+			return m.Raw
+		}()
+	} else if s, ok := i.(string); ok {
+		str = s
 	}
-	str := m.String()
 	if str == "" {
-		log.Warn("群消息发送失败: 信息为空.")
+		log.Warnf("群消息发送失败: 信息为空. MSG: %v", i)
 		return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
 	}
 	var elem []message.IMessageElement
@@ -390,9 +311,9 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 	fixAt(elem)
 	mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
-		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
-	log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(str), mid)
+	log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupID, groupID, limitedString(str), mid)
 	return OK(MSG{"message_id": mid})
 }
 
@@ -405,15 +326,14 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 	}
 	var sendNodes []*message.ForwardNode
 	ts := time.Now().Add(-time.Minute * 5)
-	hasCustom := false
+	hasCustom := func() bool {
-	m.ForEach(func(_, item gjson.Result) bool {
+		for _, item := range m.Array() {
-		if item.Get("data.uin").Exists() || item.Get("data.user_id").Exists() {
+			if item.Get("data.uin").Exists() {
-			hasCustom = true
+				return true
-			return false
+			}
 		}
-		return true
+		return false
-	})
+	}()
-
 	var convert func(e gjson.Result) []*message.ForwardNode
 	convert = func(e gjson.Result) (nodes []*message.ForwardNode) {
 		if e.Get("type").Str != "node" {
@@ -421,7 +341,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 		}
 		ts.Add(time.Second)
 		if e.Get("data.id").Exists() {
-			i := e.Get("data.id").Int()
+			i, _ := strconv.Atoi(e.Get("data.id").String())
 			m := bot.GetMessage(int32(i))
 			if m != nil {
 				sender := m["sender"].(message.Sender)
@@ -442,9 +362,9 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 			log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str)
 			return
 		}
-		uin := e.Get("data.[user_id,uin].0").Int()
+		uin, _ := strconv.ParseInt(e.Get("data.uin").Str, 10, 64)
-		msgTime := e.Get("data.time").Int()
+		msgTime, err := strconv.ParseInt(e.Get("data.time").Str, 10, 64)
-		if msgTime == 0 {
+		if err != nil {
 			msgTime = ts.Unix()
 		}
 		name := e.Get("data.name").Str
@@ -452,7 +372,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 		if c.IsArray() {
 			flag := false
 			c.ForEach(func(_, value gjson.Result) bool {
-				if value.Get("type").Str == "node" {
+				if value.Get("type").String() == "node" {
 					flag = true
 					return false
 				}
@@ -476,14 +396,23 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 		if uin != 0 && name != "" && len(content) > 0 {
 			var newElem []message.IMessageElement
 			for _, elem := range content {
-				switch elem.(type) {
+				if img, ok := elem.(*LocalImageElement); ok {
-				case *LocalImageElement, *LocalVideoElement:
+					gm, err := bot.UploadLocalImageAsGroup(groupID, img)
-					gm, err := bot.uploadMedia(elem, groupID, true)
 					if err != nil {
-						log.Warnf("警告: 群 %d %s上传失败: %v", groupID, elem.Type().String(), err)
+						log.Warnf("警告：群 %v 图片上传失败: %v", groupID, err)
 						continue
 					}
-					elem = gm
+					newElem = append(newElem, gm)
+					continue
+				}
+				if video, ok := elem.(*LocalVideoElement); ok {
+					gm, err := bot.UploadLocalVideo(groupID, video)
+					if err != nil {
+						log.Warnf("警告：群 %v 视频上传失败: %v", groupID, err)
+						continue
+					}
+					newElem = append(newElem, gm)
+					continue
 				}
 				newElem = append(newElem, elem)
 			}
@@ -495,7 +424,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 			})
 			return
 		}
-		log.Warnf("警告: 非法 Forward node 将跳过. uin: %v name: %v content count: %v", uin, name, len(content))
+		log.Warnf("警告: 非法 Forward node 将跳过")
 		return
 	}
 	if m.IsArray() {
@@ -509,29 +438,39 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 		ret := bot.Client.SendGroupForwardMessage(groupID, &message.ForwardMessage{Nodes: sendNodes})
 		if ret == nil || ret.Id == -1 {
 			log.Warnf("合并转发(群)消息发送失败: 账号可能被风控.")
-			return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+			return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 		}
 		return OK(MSG{
 			"message_id": bot.InsertGroupMessage(ret),
 		})
 	}
-	return Failed(100, "EMPTY_NODES", "未找到任何可发送的合并转发信息")
+	return Failed(100)
 }
 
 // CQSendPrivateMessage 发送私聊消息
 //
 // https://git.io/Jtz1l
-func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Result, autoEscape bool) MSG {
+func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, i interface{}, autoEscape bool) MSG {
-	if m.Type == gjson.JSON {
+	var str string
-		elem := bot.ConvertObjectMessage(m, false)
+	if m, ok := i.(gjson.Result); ok {
-		mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
+		if m.Type == gjson.JSON {
-		if mid == -1 {
+			elem := bot.ConvertObjectMessage(m, false)
-			return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+			mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
+			if mid == -1 {
+				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
+			}
+			log.Infof("发送好友 %v(%v)  的消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
+			return OK(MSG{"message_id": mid})
 		}
-		log.Infof("发送好友 %v(%v)  的消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
+		str = func() string {
-		return OK(MSG{"message_id": mid})
+			if m.Str != "" {
+				return m.Str
+			}
+			return m.Raw
+		}()
+	} else if s, ok := i.(string); ok {
+		str = s
 	}
-	str := m.String()
 	if str == "" {
 		return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
 	}
@@ -543,7 +482,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Resu
 	}
 	mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
-		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
 	log.Infof("发送好友 %v(%v)  的消息: %v (%v)", userID, userID, limitedString(str), mid)
 	return OK(MSG{"message_id": mid})
@@ -589,26 +528,12 @@ func (bot *CQBot) CQSetGroupName(groupID int64, name string) MSG {
 // CQSetGroupMemo 扩展API-发送群公告
 //
 // https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E7%BE%A4%E5%85%AC%E5%91%8A
-func (bot *CQBot) CQSetGroupMemo(groupID int64, msg string, img string) MSG {
+func (bot *CQBot) CQSetGroupMemo(groupID int64, msg string) MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if g.SelfPermission() == client.Member {
 			return Failed(100, "PERMISSION_DENIED", "权限不足")
 		}
-		if img != "" {
+		_ = bot.Client.AddGroupNoticeSimple(groupID, msg)
-			data, err := global.FindFile(img, "", global.ImagePath)
-			if err != nil {
-				return Failed(100, "IMAGE_NOT_FOUND", "图片未找到")
-			}
-			err = bot.Client.AddGroupNoticeWithPic(groupID, msg, data)
-			if err != nil {
-				return Failed(100, "SEND_NOTICE_ERROR", err.Error())
-			}
-		} else {
-			err := bot.Client.AddGroupNoticeSimple(groupID, msg)
-			if err != nil {
-				return Failed(100, "SEND_NOTICE_ERROR", err.Error())
-			}
-		}
 		return OK(nil)
 	}
 	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
@@ -917,7 +842,12 @@ 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)
@@ -998,7 +928,7 @@ func (bot *CQBot) CQGetImage(file string) MSG {
 	if !global.PathExists(path.Join(global.ImagePath, file)) {
 		return Failed(100)
 	}
-	b, err := os.ReadFile(path.Join(global.ImagePath, file))
+	b, err := ioutil.ReadFile(path.Join(global.ImagePath, file))
 	if err == nil {
 		r := binary.NewReader(b)
 		r.ReadBytes(16)
@@ -1009,12 +939,9 @@ func (bot *CQBot) CQGetImage(file string) MSG {
 		}
 		local := path.Join(global.CachePath, file+"."+path.Ext(msg["filename"].(string)))
 		if !global.PathExists(local) {
-			f, _ := os.OpenFile(local, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o0644)
+			if data, err := global.GetBytes(msg["url"].(string)); err == nil {
-			if body, err := global.HTTPGetReadCloser(msg["url"].(string)); err == nil {
+				_ = ioutil.WriteFile(local, data, 0644)
-				_, _ = f.ReadFrom(body)
-				_ = body.Close()
 			}
-			f.Close()
 		}
 		msg["file"] = local
 		return OK(msg)
@@ -1102,7 +1029,7 @@ func (bot *CQBot) CQGetMessage(messageID int32) MSG {
 			if isGroup {
 				return gid.(int64)
 			}
-			return 0
+			return sender.Uin
 		}(), false),
 	})
 }
@@ -1138,7 +1065,7 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) MSG {
 		log.Warnf("获取群历史消息失败: %v", err)
 		return Failed(100, "MESSAGES_API_ERROR", err.Error())
 	}
-	ms := make([]MSG, 0, len(msg))
+	var ms = make([]MSG, 0, len(msg))
 	for _, m := range msg {
 		id := m.Id
 		bot.checkMedia(m.Elements)
@@ -1164,7 +1091,7 @@ func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
 			return Failed(100, "REFRESH_STATUS_ERROR", err.Error())
 		}
 	}
-	d := make([]MSG, 0, len(bot.Client.OnlineClients))
+	var d = make([]MSG, 0, len(bot.Client.OnlineClients))
 	for _, oc := range bot.Client.OnlineClients {
 		d = append(d, MSG{
 			"app_id":      oc.AppId,
@@ -1208,6 +1135,14 @@ 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
@@ -1316,14 +1251,14 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG {
 	}
 	list := make([]MSG, 0, len(msgList))
 	for _, m := range msgList {
-		msg := MSG{
+		var msg = MSG{
 			"sender_nick":   m.SenderNick,
 			"sender_time":   m.SenderTime,
 			"operator_time": m.AddDigestTime,
 			"operator_nick": m.AddDigestNick,
-			"sender_id":     m.SenderUin,
-			"operator_id":   m.AddDigestUin,
 		}
+		msg["sender_id"], _ = strconv.ParseUint(m.SenderUin, 10, 64)
+		msg["operator_id"], _ = strconv.ParseUint(m.AddDigestUin, 10, 64)
 		msg["message_id"] = toGlobalID(groupCode, int32(m.MessageID))
 		list = append(list, msg)
 	}
@@ -1368,8 +1303,6 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 				return 2
 			case client.MacOS:
 				return 3
-			case client.QiDian:
-				return 4
 			default:
 				return -1
 			}
@@ -1377,37 +1310,6 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 	})
 }
 
-// CQGetModelShow 获取在线机型
-//
-// https://club.vip.qq.com/onlinestatus/set
-func (bot *CQBot) CQGetModelShow(modelName string) MSG {
-	variants, err := bot.Client.GetModelShow(modelName)
-	if err != nil {
-		return Failed(100, "GET_MODEL_SHOW_API_ERROR", "无法获取在线机型")
-	}
-	a := make([]MSG, 0, len(variants))
-	for _, v := range variants {
-		a = append(a, MSG{
-			"model_show": v.ModelShow,
-			"need_pay":   v.NeedPay,
-		})
-	}
-	return OK(MSG{
-		"variants": a,
-	})
-}
-
-// CQSetModelShow 设置在线机型
-//
-// https://club.vip.qq.com/onlinestatus/set
-func (bot *CQBot) CQSetModelShow(modelName string, modelShow string) MSG {
-	err := bot.Client.SetModelShow(modelName, modelShow)
-	if err != nil {
-		return Failed(100, "SET_MODEL_SHOW_API_ERROR", "无法设置在线机型")
-	}
-	return OK(nil)
-}
-
 // OK 生成成功返回值
 func OK(data interface{}) MSG {
 	return MSG{"data": data, "retcode": 0, "status": "ok"}
@@ -1466,17 +1368,10 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
 }
 
 func limitedString(str string) string {
-	limited := [14]rune{10: ' ', 11: '.', 12: '.', 13: '.'}
+	if strings.Count(str, "") <= 10 {
-	i := 0
-	for _, r := range str {
-		if i >= 10 {
-			break
-		}
-		limited[i] = r
-		i++
-	}
-	if i != 10 {
 		return str
 	}
-	return string(limited[:])
+	limited := []rune(str)
+	limited = limited[:10]
+	return string(limited) + " ..."
 }

coolq/bot.go

@@ -13,20 +13,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gabriel-vasile/mimetype"
+	"github.com/Mrs4s/go-cqhttp/global"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	jsoniter "github.com/json-iterator/go"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -35,77 +30,27 @@ var json = jsoniter.ConfigCompatibleWithStandardLibrary
 type CQBot struct {
 	Client *client.QQClient
 
-	lock   sync.RWMutex
+	events         []func(*bytes.Buffer)
-	events []func(*Event)
+	db             *leveldb.DB
-
+	friendReqCache sync.Map
-	db               *leveldb.DB
+	tempMsgCache   sync.Map
-	friendReqCache   sync.Map
+	oneWayMsgCache sync.Map
-	tempSessionCache sync.Map
-	oneWayMsgCache   sync.Map
 }
 
 // MSG 消息Map
 type MSG map[string]interface{}
 
-// Event 事件
-type Event struct {
-	RawMsg MSG
-
-	once   sync.Once
-	buffer *bytes.Buffer
-}
-
-func (e *Event) marshal() {
-	if e.buffer == nil {
-		e.buffer = global.NewBuffer()
-	}
-	_ = json.NewEncoder(e.buffer).Encode(e.RawMsg)
-}
-
-// JSONBytes return byes of json by lazy marshalling.
-func (e *Event) JSONBytes() []byte {
-	e.once.Do(e.marshal)
-	return e.buffer.Bytes()
-}
-
-// JSONString return string of json without extra allocation
-// by lazy marshalling.
-func (e *Event) JSONString() string {
-	e.once.Do(e.marshal)
-	return utils.B2S(e.buffer.Bytes())
-}
-
 // ForceFragmented 是否启用强制分片
 var ForceFragmented = false
 
-// SkipMimeScan 是否跳过Mime扫描
-var SkipMimeScan bool
-
-var lawfulImageTypes = []string{"image/png", "image/jpeg", "image/gif", "image/bmp"}
-
-var lawfulAudioTypes = []string{
-	"audio/mpeg", "audio/flac", "audio/midi", "audio/ogg",
-	"audio/ape", "audio/amr", "audio/wav", "audio/aiff",
-	"audio/mp4", "audio/aac", "audio/x-m4a",
-}
-
 // NewQQBot 初始化一个QQBot实例
-func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
+func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
-	enableLevelDB := false
+	if conf.EnableDB {
-	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, &opt.Options{
+		db, err := leveldb.OpenFile(p, nil)
-			WriteBuffer: 128 * opt.KiB,
-		})
 		if err != nil {
 			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
 		}
@@ -117,7 +62,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	if conf.Message.ReportSelfMessage {
+	if conf.EnableSelfMessage {
 		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
@@ -141,17 +86,16 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		i := conf.Heartbeat.Interval
+		i := conf.HeartbeatInterval
-		if i < 0 || conf.Heartbeat.Disabled {
+		if i < 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
 		if i == 0 {
 			i = 5
 		}
-		t := time.NewTicker(time.Second * time.Duration(i))
 		for {
-			<-t.C
+			time.Sleep(time.Second * i)
 			bot.dispatchEventMessage(MSG{
 				"time":            time.Now().Unix(),
 				"self_id":         bot.Client.Uin,
@@ -166,10 +110,8 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 }
 
 // OnEventPush 注册事件上报函数
-func (bot *CQBot) OnEventPush(f func(e *Event)) {
+func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
-	bot.lock.Lock()
 	bot.events = append(bot.events, f)
-	bot.lock.Unlock()
 }
 
 // GetMessage 获取给定消息id对应的消息
@@ -178,7 +120,10 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 		m := MSG{}
 		data, err := bot.db.Get(binary.ToBytes(mid), nil)
 		if err == nil {
-			err = gob.NewDecoder(bytes.NewReader(data)).Decode(&m)
+			buff := global.NewBuffer()
+			defer global.PutBuffer(buff)
+			buff.Write(binary.GZipUncompress(data))
+			err = gob.NewDecoder(buff).Decode(&m)
 			if err == nil {
 				return m
 			}
@@ -189,24 +134,11 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 }
 
 // UploadLocalImageAsGroup 上传本地图片至群聊
-func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
+func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
-	if img.File != "" {
+	if img.Stream != nil {
-		f, err := os.Open(img.File)
+		return bot.Client.UploadGroupImage(groupCode, img.Stream)
-		if err != nil {
-			return nil, errors.Wrap(err, "open image error")
-		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
 	}
-	if lawful, mime := IsLawfulImage(img.Stream); !lawful {
+	return bot.Client.UploadGroupImageByFile(groupCode, img.File)
-		return nil, errors.New("image type error: " + mime)
-	}
-	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
-	if i != nil {
-		i.Flash = img.Flash
-		i.EffectID = img.EffectID
-	}
-	return
 }
 
 // UploadLocalVideo 上传本地短视频至群聊
@@ -227,61 +159,76 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
 }
 
 // UploadLocalImageAsPrivate 上传本地图片至私聊
-func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
+func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
 	if img.Stream != nil {
-		i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
+		return bot.Client.UploadPrivateImage(userID, img.Stream)
-	} else {
-		// need update.
-		f, e := os.Open(img.File)
-		if e != nil {
-			return nil, e
-		}
-		defer f.Close()
-		i, err = bot.Client.UploadPrivateImage(userID, f)
 	}
-
+	// need update.
-	if i != nil {
+	f, err := os.Open(img.File)
-		i.Flash = img.Flash
+	if err != nil {
+		return nil, err
 	}
-	return
+	defer f.Close()
+	return bot.Client.UploadPrivateImage(userID, f)
 }
 
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
-	for _, e := range m.Elements {
+	for _, elem := range m.Elements {
-		switch i := e.(type) {
+		if i, ok := elem.(*LocalImageElement); ok {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
+			gm, err := bot.UploadLocalImageAsGroup(groupID, i)
-			i, err := bot.uploadMedia(i, groupID, true)
 			if err != nil {
-				log.Warnf("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
+				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
 				continue
 			}
-			e = i
+			newElem = append(newElem, gm)
-		case *PokeElement:
+			continue
-			if group != nil {
+		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(groupID, i)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*PokeElement); ok {
+			if group := bot.Client.FindGroup(groupID); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
+					return 0
 				}
 			}
-			return 0
+		}
-		case *GiftElement:
+		if i, ok := elem.(*GiftElement); ok {
 			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
 			return 0
-		case *message.MusicShareElement:
+		}
+		if i, ok := elem.(*message.MusicShareElement); ok {
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
 				return -1
 			}
 			return bot.InsertGroupMessage(ret)
-		case *message.AtElement:
-			if i.Target == 0 && group.SelfPermission() == client.Member {
-				e = message.NewText("@全体成员")
-			}
 		}
-		newElem = append(newElem, e)
+		if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
+			newElem = append(newElem, message.NewText("@全体成员"))
+			continue
+		}
+		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
@@ -299,24 +246,44 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 
 // SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
-	for _, e := range m.Elements {
+	for _, elem := range m.Elements {
-		switch i := e.(type) {
+		if i, ok := elem.(*LocalImageElement); ok {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
+			fm, err := bot.UploadLocalImageAsPrivate(target, i)
-			i, err := bot.uploadMedia(i, groupID, false)
 			if err != nil {
-				log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
+				log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
 				continue
 			}
-			e = i
+			newElem = append(newElem, fm)
-		case *PokeElement:
+			continue
+		}
+		if i, ok := elem.(*PokeElement); ok {
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
-		case *message.MusicShareElement:
+		}
-			bot.Client.SendFriendMusicShare(groupID, i)
+		if i, ok := elem.(*message.VoiceElement); ok {
+			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, fv)
+			continue
+		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(target, i)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*message.MusicShareElement); ok {
+			bot.Client.SendFriendMusicShare(target, i)
 			return 0
 		}
-		newElem = append(newElem, e)
+		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("好友消息发送失败: 消息为空.")
@@ -330,27 +297,22 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	} else if session, ok := bot.tempSessionCache.Load(target); ok || groupID != 0 { // 临时会话
+	} else if code, ok := bot.tempMsgCache.Load(target); ok || groupID != 0 { // 临时会话
 		switch {
-		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
+		case bot.Client.FindGroup(groupID) == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
+			id = -1
 		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
 			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
+			id = -1
 		case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
 			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
+			id = -1
 		default:
-			if session == nil && groupID != 0 {
+			if code != nil {
-				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
+				groupID = code.(int64)
-				if msg != nil {
-					id = bot.InsertTempMessage(target, msg)
-				}
-				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)
 			}
@@ -367,6 +329,9 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		}
 		log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
 	}
+	if id == -1 {
+		return -1
+	}
 	return id
 }
 
@@ -389,7 +354,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
@@ -405,7 +370,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 		"target":      m.Target,
 		"sender":      m.Sender,
 		"time":        m.Time,
-		"message":     ToStringMessage(m.Elements, 0, true),
+		"message":     ToStringMessage(m.Elements, m.Sender.Uin, true),
 	}
 	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
@@ -415,7 +380,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
@@ -432,8 +397,8 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 		"group-name": m.GroupName,
 		"target":     target,
 		"sender":     m.Sender,
-		"time":       int32(time.Now().Unix()),
+		"time":       time.Now().Unix(),
-		"message":    ToStringMessage(m.Elements, 0, true),
+		"message":    ToStringMessage(m.Elements, m.Sender.Uin, true),
 	}
 	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
@@ -443,7 +408,7 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
@@ -464,23 +429,24 @@ func (bot *CQBot) Release() {
 }
 
 func (bot *CQBot) dispatchEventMessage(m MSG) {
-	bot.lock.RLock()
+	if global.EventFilter != nil && !global.EventFilter.Eval(global.MSG(m)) {
-	defer bot.lock.RUnlock()
+		log.Debug("Event filtered!")
-
+		return
-	event := &Event{RawMsg: m}
+	}
+	buf := global.NewBuffer()
 	wg := sync.WaitGroup{}
 	wg.Add(len(bot.events))
+	_ = json.NewEncoder(buf).Encode(m)
 	for _, f := range bot.events {
-		go func(fn func(*Event)) {
+		go func(fn func(*bytes.Buffer)) {
 			defer func() {
 				wg.Done()
 				if pan := recover(); pan != nil {
 					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
 				}
 			}()
-
 			start := time.Now()
-			fn(event)
+			fn(buf)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
@@ -488,7 +454,7 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
 		}(f)
 	}
 	wg.Wait()
-	global.PutBuffer(event.buffer)
+	global.PutBuffer(buf)
 }
 
 func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
@@ -544,16 +510,18 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 			}
 		}
 		ms := gm["sender"].(MSG)
-		switch mem.Permission {
+		ms["role"] = func() string {
-		case client.Owner:
+			switch mem.Permission {
-			ms["role"] = "owner"
+			case client.Owner:
-		case client.Administrator:
+				return "owner"
-			ms["role"] = "admin"
+			case client.Administrator:
-		case client.Member:
+				return "admin"
-			ms["role"] = "member"
+			case client.Member:
-		default:
+				return "member"
-			ms["role"] = "member"
+			default:
-		}
+				return "member"
+			}
+		}()
 		ms["nickname"] = mem.Nickname
 		ms["card"] = mem.CardName
 		ms["title"] = mem.SpecialTitle
@@ -572,38 +540,8 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 
-func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group bool) (message.IMessageElement, error) {
+// ToJSON 生成JSON字符串
-	switch m := raw.(type) {
+func (m MSG) ToJSON() string {
-	case *LocalImageElement:
+	b, _ := json.Marshal(m)
-		if group {
+	return string(b)
-			return bot.UploadLocalImageAsGroup(target, m)
-		}
-		return bot.UploadLocalImageAsPrivate(target, m)
-	case *message.VoiceElement:
-		if group {
-			return bot.Client.UploadGroupPtt(target, bytes.NewReader(m.Data))
-		}
-		return bot.Client.UploadPrivatePtt(target, bytes.NewReader(m.Data))
-	case *LocalVideoElement:
-		return bot.UploadLocalVideo(target, m)
-	}
-	return nil, errors.New("unsupported message element type")
-}
-
-// IsLawfulImage 判断给定流是否为合法图片
-// 返回 是否合法, 实际Mime
-// 判断后会自动将 Stream Seek 至 0
-func IsLawfulImage(r io.ReadSeeker) (bool, string) {
-	if SkipMimeScan {
-		return true, ""
-	}
-	_, _ = r.Seek(0, io.SeekStart)
-	defer func() { _, _ = r.Seek(0, io.SeekStart) }()
-	t, err := mimetype.DetectReader(r)
-	if err != nil {
-		log.Debugf("扫描 Mime 时出现问题: %v", err)
-		return false, ""
-	}
-	mime := t.String()
-	return mimetype.EqualsAny(mime, lawfulImageTypes...), mime
 }

coolq/cqcode_test.go

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

coolq/event.go

@@ -2,7 +2,7 @@ package coolq
 
 import (
 	"encoding/hex"
-	"os"
+	"io/ioutil"
 	"path"
 	"strconv"
 	"strings"
@@ -24,18 +24,18 @@ func SetMessageFormat(f string) {
 }
 
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r interface{}) {
+func ToFormattedMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r interface{}) {
 	if format == "string" {
-		r = ToStringMessage(e, groupID, isRaw...)
+		r = ToStringMessage(e, id, isRaw...)
 	} else if format == "array" {
-		r = ToArrayMessage(e, groupID)
+		r = ToArrayMessage(e, id, isRaw...)
 	}
 	return
 }
 
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
 	if !m.Sender.IsFriend {
 		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
 	}
@@ -45,18 +45,13 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 	}
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	fm := MSG{
-		"post_type": func() string {
+		"post_type":    "message",
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
 		"message_type": "private",
 		"sub_type":     "friend",
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"target_id":    m.Target,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -69,9 +64,6 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		},
 	}
 	bot.dispatchEventMessage(fm)
-	if m.Sender.Uin != c.Uin {
-		c.MarkPrivateMessageReaded(m.Sender.Uin, int64(m.Time))
-	}
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
@@ -109,16 +101,12 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	}
 	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
-	if m.Sender.Uin != c.Uin {
-		c.MarkGroupMessageReaded(m.GroupCode, int64(m.Id))
-	}
 }
 
-func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
+func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
-	m := e.Message
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
-	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
+	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
 	id := m.Id
 	if bot.db != nil {
 		id = bot.InsertTempMessage(m.Sender.Uin, m)
@@ -128,10 +116,9 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
-		"temp_source":  e.Session.Source,
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -366,12 +353,12 @@ func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCar
 	})
 }
 
-func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
+func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *client.MemberJoinGroupEvent) {
 	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
 	bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
 }
 
-func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
+func (bot *CQBot) memberLeaveEvent(c *client.QQClient, e *client.MemberLeaveGroupEvent) {
 	if e.Operator != nil {
 		log.Infof("成员 %v 被 %v T出了群 %v.", formatMemberName(e.Member), formatMemberName(e.Operator), formatGroupName(e.Group))
 	} else {
@@ -397,7 +384,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.tempSessionCache.Delete(e.Friend.Uin)
+	bot.tempMsgCache.Delete(e.Friend.Uin)
 	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_add",
@@ -542,26 +529,59 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 	for _, elem := range e {
 		switch i := elem.(type) {
+		case *message.ImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+			i.Filename = filename
 		case *message.GroupImageElement:
 			filename := hex.EncodeToString(i.Md5) + ".image"
 			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(i.ImageId)
+					w.WriteString(filename)
 					w.WriteString(i.Url)
-				}), 0o644)
+				}), 0644)
 			}
 		case *message.FriendImageElement:
 			filename := hex.EncodeToString(i.Md5) + ".image"
 			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+		case *message.GroupFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(i.ImageId)
+					w.WriteString(i.Filename)
-					w.WriteString(i.Url)
+					w.WriteString("")
-				}), 0o644)
+				}), 0644)
 			}
+			i.Filename = filename
+		case *message.FriendFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString("")
+				}), 0644)
+			}
+			i.Filename = filename
 		case *message.VoiceElement:
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
@@ -571,19 +591,19 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
+				_ = ioutil.WriteFile(path.Join(global.VoicePath, i.Name), b, 0644)
 			}
 		case *message.ShortVideoElement:
 			filename := hex.EncodeToString(i.Md5) + ".video"
 			if !global.PathExists(path.Join(global.VideoPath, filename)) {
-				_ = os.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
+				_ = ioutil.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.Write(i.ThumbMd5)
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteUInt32(uint32(i.ThumbSize))
 					w.WriteString(i.Name)
 					w.Write(i.Uuid)
-				}), 0o644)
+				}), 0644)
 			}
 			i.Name = filename
 			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)

docs/EventFilter.md

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

docs/README.md

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

docs/config.md

@@ -1,180 +1,102 @@
 # 配置
 
-go-cqhttp 包含 `config.yml` 和 `device.json` 两个配置文件, 其中 `config.yml` 为运行配置 `device.json` 为虚拟设备信息.
+go-cqhttp 包含 `config.hjson` 和 `device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息.
+
+## 从原CQHTTP导入配置
+
+go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
+
+1. 找到CQHTTP原配置文件 `{CQ工作目录}/app/io.github.richardchien.coolqhttpapi/config/{qq号}.json`
+2. 将文件复制到go-cqhttp根目录并重命名为 `cqhttp.json`
+3. 重启go-cqhttp后将自动导入配置
 
 ## 配置信息
 
-go-cqhttp 的配置文件采用 YAML , 在使用之前希望你能了解 YAML 的语法([教程](https://www.runoob.com/w3cnote/yaml-intro.html))
-
 默认生成的配置文件如下所示:
 
-````yaml
+````json
-# go-cqhttp 默认配置文件
+{
-
+  "uin": 0,
-account: # 账号相关
+  "password": "",
-  uin: 1233456 # QQ账号
+  "encrypt_password": false,
-  password: '' # 密码为空时使用扫码登录
+  "password_encrypted": "",
-  encrypt: false  # 是否开启密码加密
+  "enable_db": true,
-  status: 0      # 在线状态,详情请查看下方的在线状态表
+  "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
+      "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:
-      # 服务端监听地址
-      host: 127.0.0.1
-      # 服务端监听端口
-      port: 5700
-      # 反向HTTP超时时间, 单位秒
-      # 最小值为5，小于5将会忽略本项设置
-      timeout: 5
-      middlewares:
-        <<: *default # 引用默认中间件
-      # 反向HTTP POST地址列表
-      post:
-      #- url: '' # 地址
-      #  secret: ''           # 密钥
-      #- url: 127.0.0.1:5701 # 地址
-      #  secret: ''          # 密钥
-
-  # 正向WS设置
-  - ws:
-      # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
-      middlewares:
-        <<: *default # 引用默认中间件
-
-  - ws-reverse:
-      # 反向WS Universal 地址
-      # 注意 设置了此项地址后下面两项将会被忽略
-      universal: ws://your_websocket_universal.server
-      # 反向WS API 地址
-      api: ws://your_websocket_api.server
-      # 反向WS Event 地址
-      event: ws://your_websocket_event.server
-      # 重连间隔 单位毫秒
-      reconnect-interval: 3000
-      middlewares:
-        <<: *default # 引用默认中间件
-  # pprof 性能分析服务器, 一般情况下不需要启用.
-  # 如果遇到性能问题请上传报告给开发者处理
-  # 注意: pprof服务不支持中间件、不支持鉴权. 请不要开放到公网
-  - pprof:
-      # pprof服务器监听地址
-      host: 127.0.0.1
-      # pprof服务器监听端口
-      port: 7700
-      
-  # LambdaServer 配置
-  - lambda:
-      type: scf # 可用 scf,aws (aws未经过测试)
-      middlewares:
-        <<: *default # 引用默认中间件
-
-  # 可添加更多
-  #- ws-reverse:
-  #- ws:
-  #- http:
-
-database: # 数据库相关设置
-  leveldb:
-    # 是否启用内置leveldb数据库
-    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
-    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
-    enable: true
 ````
 
-> 注1: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
+| 字段                  | 类型     | 说明                                                                                     |
-> 解密后密码的哈希将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
+| --------------------- | -------- | ---------------------------------------------------------------------------------------- |
+| uin                   | int64    | 登录用QQ号                                                                               |
+| password              | string   | 登录用密码                                                                               |
+| encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
+| password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
+| enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
+| enable_self_message   | bool     | 是否启用 `message_sent` 事件                                                       |
+| access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
+| relogin               | bool     | 是否自动重新登录                                                                         |
+| relogin_delay         | int      | 重登录延时（秒）                                                                         |
+| max_relogin_times     | uint     | 最大重登录次数，若0则不设置上限                                                          |
+| _rate_limit           | bool     | 是否启用API调用限速                                                                      |
+| frequency             | float64  | 1s内能调用API的次数                                                                      |
+| bucket_size           | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                               |
+| post_message_format   | string   | 上报信息类型                                                                             |
+| ignore_invalid_cqcode | bool     | 是否忽略错误的CQ码                                                                       |
+| force_fragmented      | bool     | 是否强制分片发送群长消息                                                                 |
+| fix_url               | bool     | 是否对链接的发送进行预处理, 可缓解链接信息被风控导致无法发送的情况, 但可能影响客户端着色(不影响内容)|
+| use_sso_address       | bool     | 是否使用服务器下发的地址                                                                 |
+| heartbeat_interval    | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)                              |
+| http_config           | object   | HTTP API配置                                                                             |
+| ws_config             | object   | Websocket API 配置                                                                       |
+| ws_reverse_servers    | object[] | 反向 Websocket API 配置                                                                  |
+| log_level             | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error |
+
+> 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
+> 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
 > 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
 
-> 注2: 对于不需要的通信方式，你可以使用注释将其停用(推荐)，或者添加配置 `disabled: true` 将其关闭
+> 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
 
-> 注3: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
+> 注3：关闭心跳服务可能引起断线，请谨慎关闭
-
-> 注4：关闭心跳服务可能引起断线，请谨慎关闭
-
-## 在线状态
-
-| 状态 | 值 |
-| -----|----|
-| 在线  |  0 |
-| 离开 | 1 |
-| 隐身 | 2 |
-| 忙 | 3 |
-| 听歌中 | 4 |
-| 星座运势 | 5 |
-| 今日天气 | 6 |
-| 遇见春天 | 7 |
-| Timi中 | 8 |
-| 吃鸡中 | 9 |
-| 恋爱中 | 10 |
-| 汪汪汪 | 11 |
-| 干饭中 | 12 |
-| 学习中 | 13 |
-| 熬夜中 | 14 |
-| 打球中 | 15 |
-| 信号弱 | 16 |
-| 在线学习 | 17 |
-| 游戏中 | 18 |
-| 度假中 | 19 |
-| 追剧中 | 20 |
-| 健身中 | 21 |
 
 ## 设备信息
 
@@ -199,7 +121,6 @@ database: # 数据库相关设置
 | 1   | Android Phone | 无                                                               |
 | 2   | Android Watch | 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息            |
 | 3   | MacOS         | 无                                                               |
-| 4   | 企点           | 只能登录企点账号或企点子账号                                        |
 
 > 注意, 根据协议的不同, 各类消息有所限制
 
@@ -215,14 +136,3 @@ database: # 数据库相关设置
 1.1.1.1:53
 1.1.2.2:8899
 ````
-
-## 云函数部署
-
-使用CustomRuntime进行部署， bootstrap 文件在 `scripts/bootstrap` 中已给出。
-在部署前，请在本地完成登录，并将 `config.yml` ， `device.json` ，`bootstrap` 和 `go-cqhttp`
-一起打包。
-
-在触发器中创建一个API网关触发器，并启用继承响应， 创建完成后即可通过api网关访问go-cqhttp(建议配置 AccessToken)。
-
-> scripts/bootstrap 中使用的工作路径为 /tmp, 这个目录最大能容下500M文件, 如需长期使用，
-> 请挂载文件存储(CFS).

docs/cqhttp.md

@@ -351,7 +351,7 @@ Type: `video`
 | `file`  | string  | 支持http和file发送                                                     |
 | `cover` | string  | 视频封面，支持http，file和base64发送，格式必须为jpg                    |
 | `c`     | `2` `3` | 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
-示例: `[CQ:video,file=file:///C:\\Users\Richard\Videos\1.mp4]`
+示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
 
 ### XML 消息
 
@@ -1050,32 +1050,6 @@ JSON数组:
 
 `该 API 没有响应数据`
 
-### 删除好友
-
-终结点: `/delete_friend`
-
-**参数**
-
-| 字段名     | 数据类型 | 默认值 | 说明     |
-| ---------- | -------- | ------ | -------- |
-| `id`       | int64    |        | 好友ID   |
-
-`该 API 没有响应数据`
-
-### 获取企点账号信息
-
-> 该API只有企点协议可用
-
-终结点: `/qidian_get_account_info`
-
-**响应数据**
-
-| 字段               | 类型    | 说明         |
-| ------------------ | ------- | ------------ |
-| `master_id`        | int64   | 父账号ID      |
-| `ext_name`         | string  | 用户昵称     |
-| `create_time`      | int64   | 账号创建时间  |
-
 ### 重载事件过滤器
 
 终结点：`/reload_event_filter`

global/all_test.go

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

global/buffer.go

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

global/codec.go

@@ -2,8 +2,8 @@ package global
 
 import (
 	"crypto/md5"
-	"encoding/hex"
+	"fmt"
-	"os"
+	"io/ioutil"
 	"os/exec"
 	"path"
 
@@ -19,9 +19,9 @@ func EncoderSilk(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "calc md5 failed")
 	}
-	tempName := hex.EncodeToString(h.Sum(nil))
+	tempName := fmt.Sprintf("%x", h.Sum(nil))
 	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
-		return os.ReadFile(silkPath)
+		return ioutil.ReadFile(silkPath)
 	}
 	slk, err := codec.EncodeToSilk(data, tempName, true)
 	if err != nil {

global/codec/codec.go

@@ -1,11 +1,11 @@
-//go:build (linux || (windows && !arm) || darwin) && (386 || amd64 || arm || arm64) && !race
 // +build linux windows,!arm darwin
 // +build 386 amd64 arm arm64
-// +build !race
 
+// Package codec Slik编码核心模块
 package codec
 
 import (
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -14,13 +14,15 @@ import (
 	"github.com/wdvxdr1123/go-silk"
 )
 
-const silkCachePath = "data/cache"
+const (
+	silkCachePath = "data/cache"
+)
 
 // EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
 	// 1. 写入缓存文件
 	rawPath := path.Join(silkCachePath, tempName+".wav")
-	err = os.WriteFile(rawPath, record, os.ModePerm)
+	err = ioutil.WriteFile(rawPath, record, os.ModePerm)
 	if err != nil {
 		return nil, errors.Wrap(err, "write temp file error")
 	}
@@ -35,7 +37,7 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte
 	defer os.Remove(pcmPath)
 
 	// 3. 转silk
-	pcm, err := os.ReadFile(pcmPath)
+	pcm, err := ioutil.ReadFile(pcmPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "read pcm file err")
 	}
@@ -45,20 +47,7 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte
 	}
 	if useCache {
 		silkPath := path.Join(silkCachePath, tempName+".silk")
-		err = os.WriteFile(silkPath, silkWav, 0o666)
+		err = ioutil.WriteFile(silkPath, silkWav, 0666)
 	}
 	return
 }
-
-// RecodeTo24K 将silk重新编码为 24000 bit rate
-func RecodeTo24K(data []byte) []byte {
-	pcm, err := silk.DecodeSilkBuffToPcm(data, 24000)
-	if err != nil {
-		panic(err)
-	}
-	data, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
-	if err != nil {
-		panic(err)
-	}
-	return data
-}

global/codec/codec_unsupportedarch.go

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

global/codec/codec_unsupportedos.go

@@ -1,16 +1,10 @@
-//go:build !windows && !linux && !darwin
 // +build !windows,!linux,!darwin
 
 package codec
 
 import "errors"
 
-// EncodeToSilk 将音频编码为Silk
+//EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
 	return nil, errors.New("not supported now")
 }
-
-// RecodeTo24K 将silk重新编码为 24000 bit rate
-func RecodeTo24K(data []byte) []byte {
-	return data
-}

global/codec/codec_windows_arm.go

@@ -2,12 +2,7 @@ package codec
 
 import "errors"
 
-// EncodeToSilk 将音频编码为Silk
+//EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
 	return nil, errors.New("not supported now")
 }
-
-// RecodeTo24K 将silk重新编码为 24000 bit rate
-func RecodeTo24K(data []byte) []byte {
-	return data
-}

global/codec/doc.go

@@ -1,2 +0,0 @@
-// Package codec Slik编码核心模块
-package codec

global/config.go

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

global/config/config.go

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

global/config/default_config.yml

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

global/filter.go

@@ -1,15 +1,51 @@
 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 gjson.Result) bool
+	Eval(payload MSG) bool
 }
 
 type operationNode struct {
@@ -17,33 +53,35 @@ type operationNode struct {
 	filter Filter
 }
 
-// notOperator 定义了过滤器中Not操作符
+// NotOperator 定义了过滤器中Not操作符
-type notOperator struct {
+type NotOperator struct {
 	operand Filter
 }
 
-func newNotOp(argument gjson.Result) Filter {
+func notOperatorConstruct(argument gjson.Result) *NotOperator {
 	if !argument.IsObject() {
 		panic("the argument of 'not' operator must be an object")
 	}
-	return &notOperator{operand: Generate("and", argument)}
+	op := new(NotOperator)
+	op.operand = Generate("and", argument)
+	return op
 }
 
 // Eval 对payload执行Not过滤
-func (op *notOperator) Eval(payload gjson.Result) bool {
+func (op *NotOperator) Eval(payload MSG) bool {
 	return !op.operand.Eval(payload)
 }
 
-// andOperator 定义了过滤器中And操作符
+// AndOperator 定义了过滤器中And操作符
-type andOperator struct {
+type AndOperator struct {
 	operands []operationNode
 }
 
-func newAndOp(argument gjson.Result) Filter {
+func andOperatorConstruct(argument gjson.Result) *AndOperator {
 	if !argument.IsObject() {
 		panic("the argument of 'and' operator must be an object")
 	}
-	op := new(andOperator)
+	op := new(AndOperator)
 	argument.ForEach(func(key, value gjson.Result) bool {
 		switch {
 		case key.Str[0] == '.':
@@ -72,7 +110,7 @@ func newAndOp(argument gjson.Result) Filter {
 }
 
 // Eval 对payload执行And过滤
-func (op *andOperator) Eval(payload gjson.Result) bool {
+func (op *AndOperator) Eval(payload MSG) bool {
 	res := true
 	for _, operand := range op.operands {
 		if len(operand.key) == 0 {
@@ -91,16 +129,16 @@ func (op *andOperator) Eval(payload gjson.Result) bool {
 	return res
 }
 
-// orOperator 定义了过滤器中Or操作符
+// OrOperator 定义了过滤器中Or操作符
-type orOperator struct {
+type OrOperator struct {
 	operands []Filter
 }
 
-func newOrOp(argument gjson.Result) Filter {
+func orOperatorConstruct(argument gjson.Result) *OrOperator {
 	if !argument.IsArray() {
 		panic("the argument of 'or' operator must be an array")
 	}
-	op := new(orOperator)
+	op := new(OrOperator)
 	argument.ForEach(func(_, value gjson.Result) bool {
 		op.operands = append(op.operands, Generate("and", value))
 		return true
@@ -109,7 +147,7 @@ func newOrOp(argument gjson.Result) Filter {
 }
 
 // Eval 对payload执行Or过滤
-func (op *orOperator) Eval(payload gjson.Result) bool {
+func (op *OrOperator) Eval(payload MSG) bool {
 	res := false
 	for _, operand := range op.operands {
 		res = res || operand.Eval(payload)
@@ -120,45 +158,49 @@ func (op *orOperator) Eval(payload gjson.Result) bool {
 	return res
 }
 
-// eqOperator 定义了过滤器中Equal操作符
+// EqualOperator 定义了过滤器中Equal操作符
-type eqOperator struct {
+type EqualOperator struct {
 	operand string
 }
 
-func newEqOp(argument gjson.Result) Filter {
+func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
-	return &eqOperator{operand: argument.String()}
+	op := new(EqualOperator)
+	op.operand = argument.String()
+	return op
 }
 
 // Eval 对payload执行Equal过滤
-func (op *eqOperator) Eval(payload gjson.Result) bool {
+func (op *EqualOperator) Eval(payload MSG) bool {
 	return payload.String() == op.operand
 }
 
-// neqOperator 定义了过滤器中NotEqual操作符
+// NotEqualOperator 定义了过滤器中NotEqual操作符
-type neqOperator struct {
+type NotEqualOperator struct {
 	operand string
 }
 
-func newNeqOp(argument gjson.Result) Filter {
+func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
-	return &neqOperator{operand: argument.String()}
+	op := new(NotEqualOperator)
+	op.operand = argument.String()
+	return op
 }
 
 // Eval 对payload执行NotEqual过滤
-func (op *neqOperator) Eval(payload gjson.Result) bool {
+func (op *NotEqualOperator) Eval(payload MSG) bool {
 	return !(payload.String() == op.operand)
 }
 
-// inOperator 定义了过滤器中In操作符
+// InOperator 定义了过滤器中In操作符
-type inOperator struct {
+type InOperator struct {
 	operandString string
 	operandArray  []string
 }
 
-func newInOp(argument gjson.Result) Filter {
+func inOperatorConstruct(argument gjson.Result) *InOperator {
 	if argument.IsObject() {
 		panic("the argument of 'in' operator must be an array or a string")
 	}
-	op := new(inOperator)
+	op := new(InOperator)
 	if argument.IsArray() {
 		op.operandArray = []string{}
 		argument.ForEach(func(_, value gjson.Result) bool {
@@ -172,7 +214,7 @@ func newInOp(argument gjson.Result) Filter {
 }
 
 // Eval 对payload执行In过滤
-func (op *inOperator) Eval(payload gjson.Result) bool {
+func (op *InOperator) Eval(payload MSG) bool {
 	payloadStr := payload.String()
 	if op.operandArray != nil {
 		for _, value := range op.operandArray {
@@ -185,60 +227,86 @@ func (op *inOperator) Eval(payload gjson.Result) bool {
 	return strings.Contains(op.operandString, payloadStr)
 }
 
-// containsOperator 定义了过滤器中Contains操作符
+// ContainsOperator 定义了过滤器中Contains操作符
-type containsOperator struct {
+type ContainsOperator struct {
 	operand string
 }
 
-func newContainOp(argument gjson.Result) Filter {
+func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
 	if argument.IsArray() || argument.IsObject() {
 		panic("the argument of 'contains' operator must be a string")
 	}
-	return &containsOperator{operand: argument.String()}
+	op := new(ContainsOperator)
+	op.operand = argument.String()
+	return op
 }
 
 // Eval 对payload执行Contains过滤
-func (op *containsOperator) Eval(payload gjson.Result) bool {
+func (op *ContainsOperator) Eval(payload MSG) bool {
 	return strings.Contains(payload.String(), op.operand)
 }
 
-// regexOperator 定义了过滤器中Regex操作符
+// RegexOperator 定义了过滤器中Regex操作符
-type regexOperator struct {
+type RegexOperator struct {
 	regex *regexp.Regexp
 }
 
-func newRegexOp(argument gjson.Result) Filter {
+func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
 	if argument.IsArray() || argument.IsObject() {
 		panic("the argument of 'regex' operator must be a string")
 	}
-	return &regexOperator{regex: regexp.MustCompile(argument.String())}
+	op := new(RegexOperator)
+	op.regex = regexp.MustCompile(argument.String())
+	return op
 }
 
 // Eval 对payload执行RegexO过滤
-func (op *regexOperator) Eval(payload gjson.Result) bool {
+func (op *RegexOperator) Eval(payload MSG) bool {
-	return op.regex.MatchString(payload.String())
+	matched := op.regex.MatchString(payload.String())
+	return matched
 }
 
 // Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
 func Generate(opName string, argument gjson.Result) Filter {
 	switch opName {
 	case "not":
-		return newNotOp(argument)
+		return notOperatorConstruct(argument)
 	case "and":
-		return newAndOp(argument)
+		return andOperatorConstruct(argument)
 	case "or":
-		return newOrOp(argument)
+		return orOperatorConstruct(argument)
-	case "eq":
-		return newEqOp(argument)
 	case "neq":
-		return newNeqOp(argument)
+		return notEqualOperatorConstruct(argument)
+	case "eq":
+		return equalOperatorConstruct(argument)
 	case "in":
-		return newInOp(argument)
+		return inOperatorConstruct(argument)
 	case "contains":
-		return newContainOp(argument)
+		return containsOperatorConstruct(argument)
 	case "regex":
-		return newRegexOp(argument)
+		return regexOperatorConstruct(argument)
 	default:
 		panic("the operator " + opName + " is not supported")
 	}
 }
+
+// EventFilter 初始化一个nil过滤器
+var EventFilter Filter
+
+// BootFilter 启动事件过滤器
+func BootFilter() {
+	defer func() {
+		if e := recover(); e != nil {
+			log.Warnf("事件过滤器启动失败: %v", e)
+			EventFilter = nil
+		} else {
+			log.Info("事件过滤器启动成功.")
+		}
+	}()
+	f, err := ioutil.ReadFile("filter.json")
+	if err != nil {
+		panic(err)
+	} else {
+		EventFilter = Generate("and", gjson.ParseBytes(f))
+	}
+}

global/fs.go

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

global/log_hook.go

@@ -47,13 +47,14 @@ func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
 		return err
 	}
 
-	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o666)
+	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
 	defer fd.Close()
 
 	log, err := hook.formatter.Format(entry)
+
 	if err != nil {
 		return err
 	}
@@ -141,36 +142,24 @@ func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus
 func GetLogLevel(level string) []logrus.Level {
 	switch level {
 	case "trace":
-		return []logrus.Level{
+		return []logrus.Level{logrus.TraceLevel, logrus.DebugLevel,
-			logrus.TraceLevel, logrus.DebugLevel,
 			logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
-		}
 	case "debug":
-		return []logrus.Level{
+		return []logrus.Level{logrus.DebugLevel, logrus.InfoLevel,
-			logrus.DebugLevel, logrus.InfoLevel,
 			logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
-		}
 	case "info":
-		return []logrus.Level{
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
-			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
-		}
 	case "warn":
-		return []logrus.Level{
+		return []logrus.Level{logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
-			logrus.FatalLevel, logrus.PanicLevel,
-		}
 	case "error":
-		return []logrus.Level{
+		return []logrus.Level{logrus.ErrorLevel, logrus.FatalLevel,
-			logrus.ErrorLevel, logrus.FatalLevel,
+			logrus.PanicLevel}
-			logrus.PanicLevel,
-		}
 	default:
-		return []logrus.Level{
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
-			logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
-		}
 	}
 }

global/net.go

@@ -2,6 +2,7 @@ package global
 
 import (
 	"bufio"
+	"bytes"
 	"compress/gzip"
 	"fmt"
 	"io"
@@ -48,19 +49,33 @@ var (
 
 // GetBytes 对给定URL发送Get请求，返回响应主体
 func GetBytes(url string) ([]byte, error) {
-	reader, err := HTTPGetReadCloser(url)
+	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
-	defer func() {
+	req.Header["User-Agent"] = []string{UserAgent}
-		_ = reader.Close()
+	resp, err := client.Do(req)
-	}()
+	if err != nil {
-	return ioutil.ReadAll(reader)
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
+		buffer := bytes.NewBuffer(body)
+		r, _ := gzip.NewReader(buffer)
+		defer r.Close()
+		unCom, err := ioutil.ReadAll(r)
+		return unCom, err
+	}
+	return body, nil
 }
 
 // DownloadFile 将给定URL对应的文件下载至给定Path
 func DownloadFile(url, path string, limit int64, headers map[string]string) error {
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
@@ -108,7 +123,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	// 初始化分块或直接下载
 	initOrDownload := func() error {
 		copyStream := func(s io.ReadCloser) error {
-			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 			if err != nil {
 				return err
 			}
@@ -177,7 +192,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	// 下载分块
 	downloadBlock := func(block *BlockMetaData) error {
 		req, _ := http.NewRequest("GET", url, nil)
-		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 		if err != nil {
 			return err
 		}
@@ -202,7 +217,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
 		}
-		buffer := make([]byte, 1024)
+		var buffer = make([]byte, 1024)
 		i, err := resp.Body.Read(buffer)
 		for {
 			if err != nil && err != io.EOF {
@@ -282,48 +297,3 @@ func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
 	}
 	return gjson.ParseBytes(d).Get("songs.0"), nil
 }
-
-type gzipCloser struct {
-	f io.Closer
-	r *gzip.Reader
-}
-
-// NewGzipReadCloser 从 io.ReadCloser 创建 gunzip io.ReadCloser
-func NewGzipReadCloser(reader io.ReadCloser) (io.ReadCloser, error) {
-	gzipReader, err := gzip.NewReader(reader)
-	if err != nil {
-		return nil, err
-	}
-	return &gzipCloser{
-		f: reader,
-		r: gzipReader,
-	}, nil
-}
-
-// Read impls io.Reader
-func (g *gzipCloser) Read(p []byte) (n int, err error) {
-	return g.r.Read(p)
-}
-
-// Close impls io.Closer
-func (g *gzipCloser) Close() error {
-	_ = g.f.Close()
-	return g.r.Close()
-}
-
-// HTTPGetReadCloser 从 Http url 获取 io.ReadCloser
-func HTTPGetReadCloser(url string) (io.ReadCloser, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header["User-Agent"] = []string{UserAgent}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
-		return NewGzipReadCloser(resp.Body)
-	}
-	return resp.Body, err
-}

global/param.go

@@ -2,16 +2,25 @@ package global
 
 import (
 	"math"
-	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
+var trueSet = map[string]struct{}{
+	"true": {},
+	"yes":  {},
+	"1":    {},
+}
+
+var falseSet = map[string]struct{}{
+	"false": {},
+	"no":    {},
+	"0":     {},
+}
+
 // EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
 //
 // 支持的合法类型有
@@ -30,28 +39,27 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 		if !j.Exists() {
 			return defaultVal
 		}
-		switch j.Type { // nolint
+		if j.Type == gjson.True {
-		case gjson.True:
 			return true
-		case gjson.False:
+		}
+		if j.Type == gjson.False {
 			return false
-		case gjson.String:
+		}
-			str = j.Str
+		if j.Type != gjson.String {
-		default:
 			return defaultVal
 		}
+		str = j.Str
 	} else if s, ok := p.(string); ok {
 		str = s
 	}
 	str = strings.ToLower(str)
-	switch str {
+	if _, ok := trueSet[str]; ok {
-	case "true", "yes", "1":
 		return true
-	case "false", "no", "0":
-		return false
-	default:
-		return defaultVal
 	}
+	if _, ok := falseSet[str]; ok {
+		return false
+	}
+	return defaultVal
 }
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
@@ -63,76 +71,23 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 // v0.9.29-fix2 > v0.9.29-fix1 -> false
 //
 // v0.9.29-fix2 < v0.9.30 -> true
-//
-// v1.0.0-alpha2 < v1.0.0-beta1 -> true
-//
-// v1.0.0 > v1.0.0-beta1 -> false
 func VersionNameCompare(current, remote string) bool {
-	defer func() { // 应该不会panic， 为了保险还是加个
+	sp := regexp.MustCompile(`[0-9]\d*`)
-		if err := recover(); err != nil {
+	cur := sp.FindAllStringSubmatch(current, -1)
-			log.Warn("检查更新失败！")
+	re := sp.FindAllStringSubmatch(remote, -1)
-		}
+	for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
-	}()
+		curSub, _ := strconv.Atoi(cur[i][0])
-	sp := regexp.MustCompile(`v(\d+)\.(\d+)\.(\d+)-?(.+)?`)
+		reSub, _ := strconv.Atoi(re[i][0])
-	cur := sp.FindStringSubmatch(current)
+		if curSub < reSub {
-	re := sp.FindStringSubmatch(remote)
+			return true
-	for i := 1; i <= 3; i++ {
-		curSub, _ := strconv.Atoi(cur[i])
-		reSub, _ := strconv.Atoi(re[i])
-		if curSub != reSub {
-			return curSub < reSub
 		}
 	}
-	if cur[4] == "" || re[4] == "" {
+	return len(cur) < len(re)
-		return re[4] == "" && cur[4] != re[4]
-	}
-	return cur[4] < re[4]
 }
 
-// SetAtDefault 在变量 variable 为默认值 defaultValue 的时候修改为 value
-func SetAtDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	if v.Elem().Interface() != defaultValue {
-		return
-	}
-	if v.Elem().Kind() != v2.Kind() {
-		return
-	}
-	v.Elem().Set(v2)
-}
-
-// SetExcludeDefault 在目标值 value 不为默认值 defaultValue 时修改 variable 为 value
-func SetExcludeDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	if v2.Elem().Interface() != defaultValue {
-		return
-	}
-	if v.Elem().Kind() != v2.Kind() {
-		return
-	}
-	v.Elem().Set(v2)
-}
-
-var (
-	// once lazy compile the reg
-	once sync.Once
-	// reg is splitURL regex pattern.
-	reg *regexp.Regexp
-)
-
 // SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
 func SplitURL(s string) []string {
-	once.Do(func() { // lazy init.
+	reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
-		reg = regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
-	})
 	idx := reg.FindAllStringIndex(s, -1)
 	if len(idx) == 0 {
 		return []string{s}

global/ratelimit.go

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

global/signal.go

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

global/signal_unix.go

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

global/signal_windows.go

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

global/terminal/doc.go

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

global/terminal/double_click.go

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

global/terminal/double_click_windows.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package terminal

global/update/update.go

@@ -1,93 +0,0 @@
-// Package update 包含go-cqhttp自我更新相关函数
-package update
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"hash"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/dustin/go-humanize"
-	"github.com/kardianos/osext"
-	log "github.com/sirupsen/logrus"
-)
-
-// WriteSumCounter 写入量计算实例
-type WriteSumCounter struct {
-	Total uint64
-	Hash  hash.Hash
-}
-
-// Write 方法将写入的byte长度追加至写入的总长度Total中
-func (wc *WriteSumCounter) Write(p []byte) (int, error) {
-	n := len(p)
-	wc.Total += uint64(n)
-	wc.Hash.Write(p)
-	fmt.Printf("\r                                    ")
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
-	return n, nil
-}
-
-// FromStream copy form getlantern/go-update
-func FromStream(updateWith io.Reader) (err error, errRecover error) {
-	updatePath, err := osext.Executable()
-	if err != nil {
-		return
-	}
-	var newBytes []byte
-	// no patch to apply, go on through
-	bufBytes := bufio.NewReader(updateWith)
-	updateWith = io.Reader(bufBytes)
-	newBytes, err = io.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, 0o755)
-	if err != nil {
-		return
-	}
-	// We won't log this error, because it's always going to happen.
-	defer func() { _ = fp.Close() }()
-	if _, err = io.Copy(fp, 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

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

global/update/update_windows.go

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

go.mod

@@ -4,14 +4,14 @@ go 1.16
 
 require (
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Microsoft/go-winio v0.5.0
+	github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083
-	github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e
 	github.com/dustin/go-humanize v1.0.0
-	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.2.1
+	github.com/guonaihong/gout v0.1.5
+	github.com/hjson/hjson-go v3.1.0+incompatible
 	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/json-iterator/go v1.1.11
+	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
@@ -19,18 +19,13 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
-	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/tidwall/gjson v1.8.1
+	github.com/tidwall/gjson v1.6.8
 	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	github.com/willf/bitset v1.2.0 // indirect
+	github.com/willf/bitset v1.1.11 // indirect
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
+	golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
-	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
-
-replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0

go.sum

@@ -2,12 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
+github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083 h1:ELaNvv80OTwHTYhKwoQpgV4dneKPM1qE5Geu3A1kM/8=
-github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
-github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e h1:PgFshw1L5TVdiDRLgr/bSotPGaGXYzbtn5cDBBvpL6U=
-github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q=
-github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
-github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -18,12 +14,12 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 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/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
-github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.0 h1:Lb3veSYoGaNck69fV2+Vf2juLSsHpMTf3Vk5+X+EDJg=
 github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -42,33 +38,33 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.2.1 h1:XnaS92y/Mpcu4MOQU5cx4hTKhbqFznbIE/uUI5sMY9E=
+github.com/guonaihong/gout v0.1.5 h1:1FeFFJWWdWYApBW9d6vzMDB4eR4Zr8T/gaVrjDVcl5U=
-github.com/guonaihong/gout v0.2.1/go.mod h1:JkjNv1G2oRWvFgP/r4DUbYhoeIBB0zMP2j1ID+5CYpU=
+github.com/guonaihong/gout v0.1.5/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
+github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
+github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/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=
-github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -105,7 +101,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 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/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
@@ -121,12 +116,12 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd
 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.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
+github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
-github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
+github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
 github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
@@ -135,12 +130,12 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
+github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
+github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -152,8 +147,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -166,21 +159,17 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 h1:Vv0JUPWTyeqUq42B2WJ1FeIDjjvGKoA2Ss+Ts0lAVbs=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/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=
@@ -202,11 +191,10 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
@@ -217,9 +205,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=

login.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -24,22 +25,6 @@ var readLine = func() (str string) {
 	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请求出错
@@ -62,13 +47,8 @@ func qrcodeLogin() error {
 	if err != nil {
 		return err
 	}
-	_ = os.WriteFile("qrcode.png", rsp.ImageData, 0o644)
+	_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0644)
-	defer func() { _ = os.Remove("qrcode.png") }()
+	log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
-	if cli.Uin != 0 {
-		log.Infof("请使用账号 %v 登录手机QQ扫描二维码 (qrcode.png) : ", cli.Uin)
-	} else {
-		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
-	}
 	time.Sleep(time.Second)
 	qrcodeTerminal.New().Get(fi.Content).Print()
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
@@ -86,21 +66,21 @@ func qrcodeLogin() error {
 			continue
 		}
 		prevState = s.State
-		switch s.State {
+		if s.State == client.QRCodeCanceled {
-		case client.QRCodeCanceled:
 			log.Fatalf("扫码被用户取消.")
-		case client.QRCodeTimeout:
+		}
+		if s.State == client.QRCodeTimeout {
 			log.Fatalf("二维码过期")
-		case client.QRCodeWaitingForConfirm:
+		}
+		if s.State == client.QRCodeWaitingForConfirm {
 			log.Infof("扫码成功, 请在手机端确认登录.")
-		case client.QRCodeConfirmed:
+		}
+		if s.State == client.QRCodeConfirmed {
 			res, err := cli.QRCodeLogin(s.LoginInfo)
 			if err != nil {
-				return err
+				return nil
 			}
 			return loginResponseProcessor(res)
-		case client.QRCodeImageFetch, client.QRCodeWaitingForScan:
-			// ignore
 		}
 	}
 }
@@ -118,27 +98,17 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		switch res.Error {
 		case client.SliderNeededError:
 			log.Warnf("登录需要滑条验证码. ")
-			log.Warnf("请参考文档 -> https://docs.go-cqhttp.org/faq/slider.html <- 进行处理")
+			log.Warnf("请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <- 抓包获取 Ticket")
-			log.Warnf("1. 自行抓包并获取 Ticket 输入.")
+			println()
-			log.Warnf("2. 使用手机QQ扫描二维码登入. (推荐)")
+			log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
-			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
+			println()
-			text = readLineTimeout(time.Second*10, "2")
+			log.Warn("请输入Ticket： (Enter 提交)")
-			if strings.Contains(text, "1") {
+			text = readLine()
-				println()
+			res, err = cli.SubmitTicket(text)
-				log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
+			continue
-				println()
-				log.Warn("请输入Ticket： (Enter 提交)")
-				text = readLine()
-				res, err = cli.SubmitTicket(text)
-				continue
-			}
-			cli.Disconnect()
-			cli.Release()
-			cli = client.NewClientEmpty()
-			return qrcodeLogin()
 		case client.NeedCaptcha:
-			log.Warnf("登录需要验证码.")
+			log.Warnf("登录需要滑条验证码.")
-			_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
+			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
 			log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
 			text = readLine()
 			global.DelFile("captcha.jpg")
@@ -159,8 +129,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
 			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
-			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
+			log.Warn("请输入(1 - 2)：")
-			text = readLineTimeout(time.Second*10, "2")
+			text = readLine()
 			if strings.Contains(text, "1") {
 				if !cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
@@ -174,8 +144,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			fallthrough
 		case client.UnsafeDeviceError:
 			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
-			log.Infof("按 Enter 或等待 5s 后继续....")
+			log.Infof("按 Enter 继续....")
-			readLineTimeout(time.Second*5, "")
+			readLine()
 			os.Exit(0)
 		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
 			msg := res.ErrorMessage
@@ -186,8 +156,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 				log.Fatalf("账号被冻结")
 			}
 			log.Warnf("登录失败: %v", msg)
-			log.Infof("按 Enter 或等待 5s 后继续....")
+			log.Infof("按 Enter 继续....")
-			readLineTimeout(time.Second*5, "")
+			readLine()
 			os.Exit(0)
 		}
 	}

main.go

@@ -5,28 +5,32 @@ import (
 	"crypto/aes"
 	"crypto/md5"
 	"crypto/sha1"
+	"encoding/base64"
 	"encoding/hex"
 	"flag"
 	"fmt"
+	"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/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/guonaihong/gout"
+	jsoniter "github.com/json-iterator/go"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	log "github.com/sirupsen/logrus"
 	easy "github.com/t-tomalak/logrus-easy-formatter"
@@ -35,87 +39,107 @@ import (
 	"golang.org/x/term"
 )
 
-var (
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
-	conf        *config.Config
+var conf *global.JSONConfig
-	isFastStart = false
+var isFastStart = false
-	// PasswordHash 存储QQ密码哈希供登录使用
+var c string
-	PasswordHash [16]byte
+var d bool
+var h bool
 
-	// AccountToken 存储AccountToken供登录使用
+func init() {
-	AccountToken []byte
+	var debug bool
-
+	flag.StringVar(&c, "c", global.DefaultConfFile, "configuration filename default is config.hjson")
-	// 允许通过配置文件设置的状态列表
+	flag.BoolVar(&d, "d", false, "running as a daemon")
-	allowStatus = [...]client.UserOnlineStatus{
+	flag.BoolVar(&debug, "D", false, "debug mode")
-		client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
+	flag.BoolVar(&h, "h", false, "this help")
-		client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
-		client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
-		client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
-		client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
-	}
-)
-
-func main() {
-	c := flag.String("c", config.DefaultConfigFile, "configuration filename default is config.hjson")
-	d := flag.Bool("d", false, "running as a daemon")
-	h := flag.Bool("h", false, "this help")
-	wd := flag.String("w", "", "cover the working directory")
-	debug := flag.Bool("D", false, "debug mode")
 	flag.Parse()
 
-	switch {
-	case *h:
-		help()
-	case *d:
-		server.Daemon()
-	case *wd != "":
-		resetWorkDir(*wd)
-	}
-
 	// 通过-c 参数替换 配置文件路径
-	config.DefaultConfigFile = *c
+	global.DefaultConfFile = c
-	conf = config.Get()
-	if *debug {
-		conf.Output.Debug = true
-	}
-	if conf.Output.Debug {
-		log.SetReportCaller(true)
-	}
-
 	logFormatter := &easy.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05",
 		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
 	}
-	rotateOptions := []rotatelogs.Option{
+	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
-		rotatelogs.WithRotationTime(time.Hour * 24),
-	}
-
-	if conf.Output.LogAging > 0 {
-		rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(time.Hour*24*time.Duration(conf.Output.LogAging)))
-	}
-	if conf.Output.LogForceNew {
-		rotateOptions = append(rotateOptions, rotatelogs.ForceNewFile())
-	}
-
-	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotateOptions...)
 	if err != nil {
 		log.Errorf("rotatelogs init err: %v", err)
 		panic(err)
 	}
 
-	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...))
+	conf = getConfig()
+	if conf == nil {
+		os.Exit(1)
+	}
 
-	mkCacheDir := func(path string, _type string) {
+	if debug {
-		if !global.PathExists(path) {
+		conf.Debug = true
-			if err := os.MkdirAll(path, 0o755); err != nil {
+	}
-				log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
+	// 在debug模式下,将在标准输出中打印当前执行行数
-			}
+	if conf.Debug {
+		log.SetReportCaller(true)
+	}
+
+	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
+
+	if global.PathExists("cqhttp.json") {
+		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
+		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
+		time.Sleep(time.Second * 5)
+		conf := global.CQHTTPAPIConfig{}
+		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
+			log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
+		}
+		goConf := global.DefaultConfig()
+		goConf.AccessToken = conf.AccessToken
+		goConf.HTTPConfig.Host = conf.Host
+		goConf.HTTPConfig.Port = conf.Port
+		goConf.WSConfig.Host = conf.WSHost
+		goConf.WSConfig.Port = conf.WSPort
+		if conf.PostURL != "" {
+			goConf.HTTPConfig.PostUrls[conf.PostURL] = conf.Secret
+		}
+		if conf.UseWsReverse {
+			goConf.ReverseServers[0].Enabled = true
+			goConf.ReverseServers[0].ReverseURL = conf.WSReverseURL
+			goConf.ReverseServers[0].ReverseAPIURL = conf.WSReverseAPIURL
+			goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
+			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
+		}
+		if err := goConf.Save(global.DefaultConfFile); err != nil {
+			log.Fatalf("保存 %s 时出现错误: %v", global.DefaultConfFile, err)
+		}
+		_ = os.Remove("cqhttp.json")
+	}
+
+	if !global.PathExists(global.ImagePath) {
+		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
+			log.Fatalf("创建图片缓存文件夹失败: %v", err)
 		}
 	}
-	mkCacheDir(global.ImagePath, "图片")
+	if !global.PathExists(global.VoicePath) {
-	mkCacheDir(global.VoicePath, "语音")
+		if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
-	mkCacheDir(global.VideoPath, "视频")
+			log.Fatalf("创建语音缓存文件夹失败: %v", err)
-	mkCacheDir(global.CachePath, "发送图片")
+		}
+	}
+	if !global.PathExists(global.VideoPath) {
+		if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
+			log.Fatalf("创建视频缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.CachePath) {
+		if err := os.MkdirAll(global.CachePath, 0755); err != nil {
+			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
+		}
+	}
+}
 
+func main() {
+	if h {
+		help()
+	}
+	if d {
+		server.Daemon()
+	}
 	var byteKey []byte
 	arg := os.Args
 	if len(arg) > 1 {
@@ -129,7 +153,8 @@ func main() {
 				}
 			case "key":
 				if len(arg) > i+1 {
-					byteKey = []byte(arg[i+1])
+					b := []byte(arg[i+1])
+					byteKey = b
 				}
 			case "faststart":
 				isFastStart = true
@@ -141,8 +166,7 @@ func main() {
 		log.Warning("将等待10s后启动")
 		time.Sleep(time.Second * 10)
 	}
-
+	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
-	if (conf.Account.Uin == 0 || (conf.Account.Password == "" && !conf.Account.Encrypt)) && !global.PathExists("session.token") {
 		log.Warn("账号密码未配置, 将使用二维码登录.")
 		if !isFastStart {
 			log.Warn("将在 5秒 后继续.")
@@ -151,16 +175,22 @@ func main() {
 	}
 
 	log.Info("当前版本:", coolq.Version)
-	if conf.Output.Debug {
+	if conf.Debug {
 		log.SetLevel(log.DebugLevel)
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
+		server.Debug = true
+		/*
+			if conf.WebUI == nil || !conf.WebUI.Enabled {
+				log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
+			}
+		*/
 	}
 	log.Info("用户交流群: 721829413")
 	if !global.PathExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
 		client.GenRandomDevice()
-		_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
+		_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0644)
 		log.Info("已生成设备信息并保存到 device.json 文件.")
 	} else {
 		log.Info("将使用 device.json 内的设备信息运行Bot.")
@@ -168,58 +198,52 @@ func main() {
 			log.Fatalf("加载设备信息失败: %v", err)
 		}
 	}
-
+	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
-	if conf.Account.Encrypt {
+		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-		if !global.PathExists("password.encrypt") {
+		byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			if conf.Account.Password == "" {
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
-				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
+		conf.Password = ""
-				readLine()
+		conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
-				os.Exit(0)
+		_ = conf.Save(global.DefaultConfFile)
-			}
+	}
-			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+	if conf.PasswordEncrypted != "" {
+		if len(byteKey) == 0 {
+			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+			cancel := make(chan struct{}, 1)
+			go func() {
+				select {
+				case <-cancel:
+					return
+				case <-time.After(time.Second * 45):
+					log.Infof("解密key输入超时")
+					time.Sleep(3 * time.Second)
+					os.Exit(0)
+				}
+			}()
 			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			PasswordHash = md5.Sum([]byte(conf.Account.Password))
+			cancel <- struct{}{}
-			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(PasswordHash[:], byteKey)), 0o644)
-			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
-			readLine()
-			os.Exit(0)
 		} else {
-			if conf.Account.Password != "" {
+			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
-				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
-				readLine()
-				os.Exit(0)
-			}
-
-			if len(byteKey) == 0 {
-				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
-				cancel := make(chan struct{}, 1)
-				state, _ := term.GetState(int(os.Stdin.Fd()))
-				go func() {
-					select {
-					case <-cancel:
-						return
-					case <-time.After(time.Second * 45):
-						log.Infof("解密key输入超时")
-						time.Sleep(3 * time.Second)
-						_ = term.Restore(int(os.Stdin.Fd()), state)
-						os.Exit(0)
-					}
-				}()
-				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-				cancel <- struct{}{}
-			} else {
-				log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
-			}
-
-			encrypt, _ := os.ReadFile("password.encrypt")
-			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
-			if err != nil {
-				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
-			}
-			copy(PasswordHash[:], ph)
 		}
-	} else {
+
-		PasswordHash = md5.Sum([]byte(conf.Account.Password))
+		// 升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
+		// 升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5
+		if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
+			password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
+			passwordHash := md5.Sum([]byte(password))
+			newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
+			conf.PasswordEncrypted = "AES:" + newPasswordHash
+			_ = conf.Save(global.DefaultConfFile)
+			log.Debug("密码加密方案升级完成")
+		}
+
+		ph, err := PasswordHashDecrypt(conf.PasswordEncrypted[4:], byteKey)
+		if err != nil {
+			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+		}
+		copy(global.PasswordHash[:], ph)
+	} else if conf.Password != "" {
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
 	}
 	if !isFastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
@@ -236,62 +260,67 @@ func main() {
 			return "Android Watch"
 		case client.MacOS:
 			return "MacOS"
-		case client.QiDian:
-			return "企点"
 		}
 		return "未知"
 	}())
-	cli = newClient()
+	cli = client.NewClientEmpty()
-	global.Proxy = conf.Message.ProxyRewrite
+	if conf.Uin != 0 && global.PasswordHash != [16]byte{} {
-	isQRCodeLogin := (conf.Account.Uin == 0 || len(conf.Account.Password) == 0) && !conf.Account.Encrypt
+		cli.Uin = conf.Uin
-	isTokenLogin := false
+		cli.PasswordMd5 = global.PasswordHash
-	saveToken := func() {
-		AccountToken = cli.GenToken()
-		_ = os.WriteFile("session.token", AccountToken, 0o644)
 	}
-	if global.PathExists("session.token") {
+	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
-		token, err := os.ReadFile("session.token")
+		switch e.Type {
-		if err == nil {
+		case "INFO":
-			if conf.Account.Uin != 0 {
+			log.Info("Protocol -> " + e.Message)
-				r := binary.NewReader(token)
+		case "ERROR":
-				cu := r.ReadInt64()
+			log.Error("Protocol -> " + e.Message)
-				if cu != conf.Account.Uin {
+		case "DEBUG":
-					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", conf.Account.Uin, cu)
+			log.Debug("Protocol -> " + e.Message)
-					log.Warnf("1. 使用会话缓存继续.")
+		}
-					log.Warnf("2. 删除会话缓存并重启.")
+	})
-					log.Warnf("请选择: (5秒后自动选1)")
+	if global.PathExists("address.txt") {
-					text := readLineTimeout(time.Second*5, "1")
+		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
-					if text == "2" {
+		addr := global.ReadAddrFile("address.txt")
-						_ = os.Remove("session.token")
+		if len(addr) > 0 {
-						os.Exit(0)
+			cli.SetCustomServer(addr)
-					}
+		}
-				}
+		log.Infof("读取到 %v 个自定义地址.", len(addr))
-			}
+	}
-			if err = cli.TokenLogin(token); err != nil {
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-				_ = os.Remove("session.token")
+		if !conf.UseSSOAddress {
-				log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-				time.Sleep(time.Second)
+			return false
-				cli.Disconnect()
+		}
-				cli.Release()
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-				cli = newClient()
+		return true
-			} else {
+	})
-				isTokenLogin = true
+	/*
+		if conf.WebUI == nil {
+			conf.WebUI = &global.GoCQWebUI{
+				Enabled:   true,
+				WebInput:  false,
+				Host:      "0.0.0.0",
+				WebUIPort: 9999,
 			}
 		}
-	}
+		if conf.WebUI.WebUIPort <= 0 {
-	if conf.Account.Uin != 0 && PasswordHash != [16]byte{} {
+			conf.WebUI.WebUIPort = 9999
-		cli.Uin = conf.Account.Uin
+		}
-		cli.PasswordMd5 = PasswordHash
+		if conf.WebUI.Host == "" {
-	}
+			conf.WebUI.Host = "127.0.0.1"
-	if !isTokenLogin {
+		}
-		if !isQRCodeLogin {
+	*/
-			if err := commonLogin(); err != nil {
+	global.Proxy = conf.ProxyRewrite
-				log.Fatalf("登录时发生致命错误: %v", err)
+	// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
-			}
+	// c := server.Console
-		} else {
+	isQRCodeLogin := (conf.Uin == 0 || len(conf.Password) == 0) && len(conf.PasswordEncrypted) == 0
-			if err := qrcodeLogin(); err != nil {
+	if !isQRCodeLogin {
-				log.Fatalf("登录时发生致命错误: %v", err)
+		if err := commonLogin(); err != nil {
-			}
+			log.Fatalf("登录时发生致命错误: %v", err)
+		}
+	} else {
+		if err := qrcodeLogin(); err != nil {
+			log.Fatalf("登录时发生致命错误: %v", err)
 		}
 	}
 	var times uint = 1 // 重试次数
@@ -299,121 +328,68 @@ func main() {
 	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
-		times = 1
+		log.Warnf("Bot已离线: %v", e.Message)
+		if !conf.ReLogin.Enabled {
+			os.Exit(1)
+		}
+		if isQRCodeLogin {
+			log.Fatalf("二维码登录暂不支持重连.")
+		}
+		if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
+			log.Fatalf("Bot重连次数超过限制, 停止")
+		}
+		if conf.ReLogin.ReLoginDelay > 0 {
+			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.ReLogin.ReLoginDelay, times, conf.ReLogin.MaxReloginTimes)
+		}
+		log.Warnf("尝试重连...")
 		if cli.Online {
 			return
 		}
-		log.Warnf("Bot已离线: %v", e.Message)
+		if err := commonLogin(); err != nil {
-		time.Sleep(time.Second * time.Duration(conf.Account.ReLogin.Delay))
+			log.Fatalf("登录时发生致命错误: %v", err)
-		for {
-			if conf.Account.ReLogin.Disabled {
-				os.Exit(1)
-			}
-			if times > conf.Account.ReLogin.MaxTimes && conf.Account.ReLogin.MaxTimes != 0 {
-				log.Fatalf("Bot重连次数超过限制, 停止")
-			}
-			times++
-			if conf.Account.ReLogin.Interval > 0 {
-				log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.Account.ReLogin.Interval, times, conf.Account.ReLogin.MaxTimes)
-				time.Sleep(time.Second * time.Duration(conf.Account.ReLogin.Interval))
-			} else {
-				time.Sleep(time.Second)
-			}
-			log.Warnf("尝试重连...")
-			err := cli.TokenLogin(AccountToken)
-			if err == nil {
-				saveToken()
-				return
-			}
-			log.Warnf("快速重连失败: %v", err)
-			if isQRCodeLogin {
-				log.Fatalf("快速重连失败, 扫码登录无法恢复会话.")
-			}
-			log.Warnf("快速重连失败, 尝试普通登录. 这可能是因为其他端强行T下线导致的.")
-			time.Sleep(time.Second)
-			if err := commonLogin(); err != nil {
-				log.Errorf("登录时发生致命错误: %v", err)
-			} else {
-				saveToken()
-				break
-			}
 		}
 	})
-	saveToken()
 	cli.AllowSlider = true
 	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
 	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList(), true)
+	global.Check(cli.ReloadFriendList())
 	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
 	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList(), true)
+	global.Check(cli.ReloadGroupList())
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if conf.Account.Status >= int32(len(allowStatus)) || conf.Account.Status < 0 {
-		conf.Account.Status = 0
-	}
-	cli.SetOnlineStatus(allowStatus[int(conf.Account.Status)])
 	bot := coolq.NewQQBot(cli, conf)
-	_ = bot.Client
+	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
-	if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
+		log.Warnf("post_message_format 配置错误, 将自动使用 string")
-		log.Warnf("post-format 配置错误, 将自动使用 string")
 		coolq.SetMessageFormat("string")
 	} else {
-		coolq.SetMessageFormat(conf.Message.PostFormat)
+		coolq.SetMessageFormat(conf.PostMessageFormat)
 	}
-	coolq.IgnoreInvalidCQCode = conf.Message.IgnoreInvalidCQCode
+	if conf.RateLimit.Enabled {
-	coolq.SplitURL = conf.Message.FixURL
+		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
-	coolq.ForceFragmented = conf.Message.ForceFragment
+	}
-	coolq.RemoveReplyAt = conf.Message.RemoveReplyAt
+	log.Info("正在加载事件过滤器.")
-	coolq.ExtraReplyData = conf.Message.ExtraReplyData
+	global.BootFilter()
-	coolq.SkipMimeScan = conf.Message.SkipMimeScan
+	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
-	for _, m := range conf.Servers {
+	coolq.SplitURL = conf.FixURL
-		if h, ok := m["http"]; ok {
+	coolq.ForceFragmented = conf.ForceFragmented
-			hc := new(config.HTTPServer)
+	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
-			if err := h.Decode(hc); err != nil {
+		go server.CQHTTPApiServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, bot)
-				log.Warn("读取http配置失败 :", err)
+		for k, v := range conf.HTTPConfig.PostUrls {
-			} else {
+			server.NewHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, bot)
-				go server.RunHTTPServerAndClients(bot, hc)
-			}
-		}
-		if s, ok := m["ws"]; ok {
-			sc := new(config.WebsocketServer)
-			if err := s.Decode(sc); err != nil {
-				log.Warn("读取正向Websocket配置失败 :", 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("读取反向Websocket配置失败 :", err)
-			} else {
-				go server.RunWebSocketClient(bot, rc)
-			}
-		}
-		if p, ok := m["pprof"]; ok {
-			pc := new(config.PprofServer)
-			if err := p.Decode(pc); err != nil {
-				log.Warn("读取pprof配置失败 :", err)
-			} else {
-				go server.RunPprofServer(pc)
-			}
-		}
-		if p, ok := m["lambda"]; ok {
-			lc := new(config.LambdaServer)
-			if err := p.Decode(lc); err != nil {
-				log.Warn("读取pprof配置失败 :", err)
-			} else {
-				go server.RunLambdaClient(bot, lc)
-			}
 		}
 	}
+	if conf.WSConfig != nil && conf.WSConfig.Enabled {
+		go server.WebSocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, bot)
+	}
+	for _, rc := range conf.ReverseServers {
+		go server.NewWebSocketClient(rc, conf.AccessToken, bot).Run()
+	}
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
-
+	c := make(chan os.Signal, 1)
 	go checkUpdate()
-
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	<-global.SetupMainSignalHandler()
+	<-c
 }
 
 // PasswordHashEncrypt 使用key加密给定passwordHash
@@ -447,6 +423,25 @@ 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 == "(devel)" {
@@ -454,11 +449,15 @@ func checkUpdate() {
 		return
 	}
 	var res string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest").BindBody(&res).Do(); err != nil {
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
 		log.Warnf("检查更新失败: %v", err)
 		return
 	}
-	info := gjson.Parse(res)
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
 	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
 		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
 		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
@@ -468,77 +467,70 @@ func checkUpdate() {
 }
 
 func selfUpdate(imageURL string) {
+	console := bufio.NewReader(os.Stdin)
+	readLine := func() (str string) {
+		str, _ = console.ReadString('\n')
+		return
+	}
 	log.Infof("正在检查更新.")
-	var res, r string
+	var res string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest").BindBody(&res).Do(); err != nil {
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
 		log.Warnf("检查更新失败: %v", err)
 		return
 	}
-	info := gjson.Parse(res)
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
 	version := info.Get("tag_name").Str
-	if coolq.Version == version {
+	if coolq.Version != version {
-		log.Info("当前版本已经是最新版本!")
+		log.Info("当前最新版本为 ", version)
-		goto wait
+		log.Warn("是否更新(y/N): ")
-	}
+		r := strings.TrimSpace(readLine())
-	log.Info("当前最新版本为 ", version)
-	log.Warn("是否更新(y/N): ")
-	r = strings.TrimSpace(readLine())
-	if r != "y" && r != "Y" {
-		log.Warn("已取消更新！")
-	} else {
-		log.Info("正在更新,请稍等...")
-		sumURL := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp_checksums.txt",
-			func() string {
-				if imageURL != "" {
-					return imageURL
-				}
-				return "https://github.com"
-			}(), version)
-		closer, err := global.HTTPGetReadCloser(sumURL)
-		if err != nil {
-			log.Error("更新失败: ", err)
-			goto wait
-		}
-		rd := bufio.NewReader(closer)
-		binaryName := fmt.Sprintf("go-cqhttp_%v_%v.%v", runtime.GOOS, func() string {
-			if runtime.GOARCH == "arm" {
-				return "armv7"
-			}
-			return runtime.GOARCH
-		}(), func() string {
-			if runtime.GOOS == "windows" {
-				return "zip"
-			}
-			return "tar.gz"
-		}())
-		var sum []byte
-		for {
-			str, err := rd.ReadString('\n')
-			if err != nil {
-				break
-			}
-			str = strings.TrimSpace(str)
-			if strings.HasSuffix(str, binaryName) {
-				sum, _ = hex.DecodeString(strings.TrimSuffix(str, "  "+binaryName))
-				break
-			}
-		}
-		url := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/%v",
-			func() string {
-				if imageURL != "" {
-					return imageURL
-				}
-				return "https://github.com"
-			}(), version, binaryName)
 
-		err = update.Update(url, sum)
+		doUpdate := func() {
-		if err != nil {
+			log.Info("正在更新,请稍等...")
-			log.Error("更新失败: ", err)
+			url := fmt.Sprintf(
-		} else {
+				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
-			log.Info("更新成功!")
+				func() string {
+					if imageURL != "" {
+						return imageURL
+					}
+					return "https://github.com"
+				}(),
+				version,
+				version,
+				runtime.GOOS,
+				runtime.GOARCH,
+			)
+			if runtime.GOOS == "windows" {
+				url += ".exe"
+			}
+			resp, err := http.Get(url)
+			if err != nil {
+				log.Error("更新失败: ", err)
+				return
+			}
+			defer func() { _ = resp.Body.Close() }()
+			wc := global.WriteCounter{}
+			err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
+			fmt.Println()
+			if err != nil {
+				log.Error("更新失败!")
+				return
+			}
+			log.Info("更新完成！")
 		}
+
+		if r == "y" || r == "Y" {
+			doUpdate()
+		} else {
+			log.Warn("已取消更新！")
+		}
+	} else {
+		log.Info("当前版本已经是最新版本!")
 	}
-wait:
 	log.Info("按 Enter 继续....")
 	readLine()
 	os.Exit(0)
@@ -577,6 +569,56 @@ func restart(args []string) {
 }
 */
 
+func getConfig() *global.JSONConfig {
+	var conf *global.JSONConfig
+	switch {
+	case global.PathExists("config.json"):
+		conf = global.LoadConfig("config.json")
+		_ = conf.Save("config.hjson")
+		_ = os.Remove("config.json")
+	case os.Getenv("UIN") != "":
+		log.Infof("将从环境变量加载配置.")
+		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
+		pwd := os.Getenv("PASS")
+		post := os.Getenv("HTTP_POST")
+		conf = &global.JSONConfig{
+			Uin:      uin,
+			Password: pwd,
+			HTTPConfig: &global.GoCQHTTPConfig{
+				Enabled:  true,
+				Host:     "0.0.0.0",
+				Port:     5700,
+				PostUrls: map[string]string{},
+			},
+			WSConfig: &global.GoCQWebSocketConfig{
+				Enabled: true,
+				Host:    "0.0.0.0",
+				Port:    6700,
+			},
+			PostMessageFormat: "string",
+			Debug:             os.Getenv("DEBUG") == "true",
+		}
+		if post != "" {
+			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
+		}
+	default:
+		conf = global.LoadConfig(global.DefaultConfFile)
+	}
+	if conf == nil {
+		err := global.WriteAllText(global.DefaultConfFile, global.DefaultConfigWithComments)
+		if err != nil {
+			log.Fatalf("创建默认配置文件时出现错误: %v", err)
+			return nil
+		}
+		log.Infof("默认配置文件已生成, 请编辑 %s 后重启程序.", global.DefaultConfFile)
+		if !isFastStart {
+			time.Sleep(time.Second * 5)
+		}
+		return nil
+	}
+	return conf
+}
+
 // help cli命令行-h的帮助提示
 func help() {
 	fmt.Printf(`go-cqhttp service
@@ -592,56 +634,3 @@ Options:
 	flag.PrintDefaults()
 	os.Exit(0)
 }
-
-func resetWorkDir(wd string) {
-	args := make([]string, 0, len(os.Args))
-	for i := 1; i < len(os.Args); i++ {
-		if os.Args[i] == "-w" {
-			i++ // skip value field
-		} else if !strings.HasPrefix(os.Args[i], "-w") {
-			args = append(args, os.Args[i])
-		}
-	}
-	p, _ := filepath.Abs(os.Args[0])
-	proc := exec.Command(p, args...)
-	proc.Stdin = os.Stdin
-	proc.Stdout = os.Stdout
-	proc.Stderr = os.Stderr
-	proc.Dir = wd
-	err := proc.Run()
-	if err != nil {
-		panic(err)
-	}
-	os.Exit(0)
-}
-
-func newClient() *client.QQClient {
-	c := client.NewClientEmpty()
-	c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !conf.Account.UseSSOAddress {
-			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			return false
-		}
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-		return true
-	})
-	if global.PathExists("address.txt") {
-		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
-		addr := global.ReadAddrFile("address.txt")
-		if len(addr) > 0 {
-			cli.SetCustomServer(addr)
-		}
-		log.Infof("读取到 %v 个自定义地址.", len(addr))
-	}
-	c.OnLog(func(c *client.QQClient, e *client.LogEvent) {
-		switch e.Type {
-		case "INFO":
-			log.Info("Protocol -> " + e.Message)
-		case "ERROR":
-			log.Error("Protocol -> " + e.Message)
-		case "DEBUG":
-			log.Debug("Protocol -> " + e.Message)
-		}
-	})
-	return c
-}

scripts/bootstrap

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

scripts/upload_dist.sh

@@ -1,19 +0,0 @@
-#!/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

@@ -13,29 +13,18 @@ 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 {
 	return bot.CQGetLoginInfo()
 }
 
-func getQiDianAccountInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
-	return bot.CQGetQiDianAccountInfo()
-}
-
 func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
 	return bot.CQGetFriendList()
 }
 
-func deleteFriend(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQDeleteFriend(p.Get("id").Int())
-}
-
 func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetGroupList(p.Get("no_cache").Bool())
 }
@@ -50,10 +39,9 @@ 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("no_cache").Bool(),
+		p.Get("group_id").Int(), p.Get("user_id").Int(),
 	)
 }
-
 func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
 	if p.Get("message_type").Str == "private" {
@@ -153,7 +141,7 @@ func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 }
 
 func sendGroupNotice(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str, p.Get("image").String())
+	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
 }
 
 func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
@@ -262,18 +250,6 @@ func uploadGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
 }
 
-func groupFileCreateFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQGroupFileCreateFolder(p.Get("group_id").Int(), p.Get("folder_id").Str, p.Get("name").Str)
-}
-
-func deleteGroupFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQGroupFileDeleteFolder(p.Get("group_id").Int(), p.Get("folder_id").Str)
-}
-
-func deleteGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("bus_id").Int()))
-}
-
 func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
 }
@@ -282,9 +258,8 @@ func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetVipInfo(p.Get("user_id").Int())
 }
 
-func reloadEventFilter(_ *coolq.CQBot, p resultGetter) coolq.MSG {
+func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
-	addFilter(p.Get("file").String())
+	return bot.CQReloadEventFilter()
-	return coolq.OK(nil)
 }
 
 func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
@@ -342,19 +317,9 @@ func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 }
 
-func getModelShow(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQGetModelShow(p.Get("model").String())
-}
-
-func setModelShow(bot *coolq.CQBot, p resultGetter) coolq.MSG {
-	return bot.CQSetModelShow(p.Get("model").String(), p.Get("model_show").String())
-}
-
-// API 是go-cqhttp当前支持的所有api的映射表
 var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"get_login_info":             getLoginInfo,
 	"get_friend_list":            getFriendList,
-	"delete_friend":              deleteFriend,
 	"get_group_list":             getGroupList,
 	"get_group_info":             getGroupInfo,
 	"get_group_member_list":      getGroupMemberList,
@@ -391,9 +356,6 @@ var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"get_group_root_files":       getGroupRootFiles,
 	"get_group_files_by_folder":  getGroupFilesByFolder,
 	"get_group_file_url":         getGroupFileURL,
-	"create_group_file_folder":   groupFileCreateFolder,
-	"delete_group_folder":        deleteGroupFolder,
-	"delete_group_file":          deleteGroupFile,
 	"upload_group_file":          uploadGroupFile,
 	"get_group_msg_history":      getGroupMsgHistory,
 	"_get_vip_info":              getVipInfo,
@@ -410,30 +372,11 @@ var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"check_url_safely":           checkURLSafely,
 	"set_group_anonymous_ban":    setGroupAnonymousBan,
 	".handle_quick_operation":    handleQuickOperation,
-	"qidian_get_account_info":    getQiDianAccountInfo,
-	"_get_model_show":            getModelShow,
-	"_set_model_show":            setModelShow,
 }
 
 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)
 	}
 	return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
 }
-
-func (api *apiCaller) use(middlewares ...handler) {
-	api.handlers = append(api.handlers, middlewares...)
-}
-
-func newAPICaller(bot *coolq.CQBot) *apiCaller {
-	return &apiCaller{
-		bot:      bot,
-		handlers: []handler{},
-	}
-}

server/daemon.go

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

server/doc.go

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

server/http.go

@@ -1,174 +1,103 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
-	"fmt"
-	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+
 	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
 	"github.com/guonaihong/gout/dataflow"
-	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global/config"
 )
 
 type httpServer struct {
-	HTTP        *http.Server
+	engine *gin.Engine
-	api         *apiCaller
+	bot    *coolq.CQBot
-	accessToken string
+	HTTP   *http.Server
+	api    apiCaller
 }
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 // HTTPClient 反向HTTP上报客户端
 type HTTPClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
-	filter  string
-	apiPort int
 	timeout int32
 }
 
-type httpCtx struct {
+type httpContext struct {
-	json     gjson.Result
+	ctx *gin.Context
-	query    url.Values
-	postForm url.Values
 }
 
-func (h *httpCtx) Get(s string) gjson.Result {
+// CQHTTPApiServer CQHTTPApiServer实例
-	j := h.json.Get(s)
+var CQHTTPApiServer = &httpServer{}
-	if j.Exists() {
-		return j
-	}
-	if h.postForm != nil {
-		if form := h.postForm.Get(s); form != "" {
-			return gjson.Result{Type: gjson.String, Str: form}
-		}
-	}
-	if h.query != nil {
-		if query := h.query.Get(s); query != "" {
-			return gjson.Result{Type: gjson.String, Str: query}
-		}
-	}
-	return gjson.Result{}
-}
 
-func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
+// Debug 是否启用Debug模式
-	var ctx httpCtx
+var Debug = false
-	contentType := request.Header.Get("Content-Type")
+
-	switch request.Method {
+func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
-	case http.MethodPost:
+	gin.SetMode(gin.ReleaseMode)
-		if strings.Contains(contentType, "application/json") {
+	s.engine = gin.New()
-			body, err := io.ReadAll(request.Body)
+	s.bot = bot
+	s.api = apiCaller{s.bot}
+	s.engine.Use(func(c *gin.Context) {
+		if c.Request.Method != "GET" && c.Request.Method != "POST" {
+			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
+			c.Status(404)
+			return
+		}
+		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
+			d, err := c.GetRawData()
 			if err != nil {
-				log.Warnf("获取请求 %v 的Body时出现错误: %v", request.RequestURI, err)
+				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
-				writer.WriteHeader(http.StatusBadRequest)
+				c.Status(400)
 				return
 			}
-			if !gjson.ValidBytes(body) {
+			if !gjson.ValidBytes(d) {
-				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", request.RemoteAddr)
+				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
-				writer.WriteHeader(http.StatusBadRequest)
+				c.Status(400)
 				return
 			}
-			ctx.json = gjson.Parse(utils.B2S(body))
+			c.Set("json_body", gjson.ParseBytes(d))
 		}
-		if strings.Contains(contentType, "application/x-www-form-urlencoded") {
+		c.Next()
-			err := request.ParseForm()
+	})
-			if err != nil {
+
-				log.Warnf("已拒绝客户端 %v 的请求: %v", request.RemoteAddr, err)
+	if authToken != "" {
-				writer.WriteHeader(http.StatusBadRequest)
+		s.engine.Use(func(c *gin.Context) {
+			auth := c.Request.Header.Get("Authorization")
+			switch {
+			case auth != "" && strings.SplitN(auth, " ", 2)[1] != authToken:
+				c.AbortWithStatus(401)
+				return
+			case c.Query("access_token") != authToken:
+				c.AbortWithStatus(401)
+				return
+			default:
+				c.Next()
 			}
-			ctx.postForm = request.PostForm
+		})
-		}
-		fallthrough
-	case http.MethodGet:
-		ctx.query = request.URL.Query()
-
-	default:
-		log.Warnf("已拒绝客户端 %v 的请求: 方法错误", request.RemoteAddr)
-		writer.WriteHeader(http.StatusNotFound)
-		return
-	}
-	if status := checkAuth(request, s.accessToken); status != http.StatusOK {
-		writer.WriteHeader(status)
-		return
 	}
 
-	action := strings.TrimPrefix(request.URL.Path, "/")
+	s.engine.Any("/:action", s.HandleActions)
-	action = strings.TrimSuffix(action, "_async")
-	log.Debugf("HTTPServer接收到API调用: %v", action)
-	ret := s.api.callAPI(action, &ctx)
-
-	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
-	writer.WriteHeader(http.StatusOK)
-	_ = json.NewEncoder(writer).Encode(ret)
-}
-
-func checkAuth(req *http.Request, token string) int {
-	if token == "" { // quick path
-		return http.StatusOK
-	}
-
-	auth := req.Header.Get("Authorization")
-	if auth == "" {
-		auth = req.URL.Query().Get("access_token")
-	} else {
-		authN := strings.SplitN(auth, " ", 2)
-		if len(authN) == 2 {
-			auth = authN[1]
-		}
-	}
-
-	switch auth {
-	case token:
-		return http.StatusOK
-	case "":
-		return http.StatusUnauthorized
-	default:
-		return http.StatusForbidden
-	}
-}
-
-// RunHTTPServerAndClients 启动HTTP服务器与HTTP上报客户端
-func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
-	if conf.Disabled {
-		return
-	}
-	var (
-		s    = new(httpServer)
-		addr string
-	)
-	s.accessToken = conf.AccessToken
-	if conf.Host == "" || conf.Port == 0 {
-		goto client
-	}
-	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
-	s.api = newAPICaller(bot)
-	if conf.RateLimit.Enabled {
-		s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
-	}
-	if conf.LongPolling.Enabled {
-		s.api.use(longPolling(bot, conf.LongPolling.MaxQueueSize))
-	}
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
 		s.HTTP = &http.Server{
 			Addr:    addr,
-			Handler: s,
+			Handler: s.engine,
 		}
 		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
@@ -178,58 +107,42 @@ func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
 			os.Exit(1)
 		}
 	}()
-client:
+}
-	for _, c := range conf.Post {
+
-		if c.URL != "" {
+// NewHTTPClient 返回反向HTTP客户端
-			go HTTPClient{
+func NewHTTPClient() *HTTPClient {
-				bot:     bot,
+	return &HTTPClient{}
-				secret:  c.Secret,
-				addr:    c.URL,
-				apiPort: conf.Port,
-				filter:  conf.Filter,
-				timeout: conf.Timeout,
-			}.Run()
-		}
-	}
 }
 
 // Run 运行反向HTTP服务
-func (c HTTPClient) Run() {
+func (c *HTTPClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
-	addFilter(c.filter)
+	c.bot = bot
+	c.secret = secret
+	c.addr = addr
+	c.timeout = timeout
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
-	c.bot.OnEventPush(c.onBotPushEvent)
+	bot.OnEventPush(c.onBotPushEvent)
-	log.Infof("HTTP POST上报器已启动: %v", c.addr)
+	log.Infof("HTTP POST上报器已启动: %v", addr)
 }
 
-func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
+func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
 	var res string
-	if c.filter != "" {
+	err := gout.POST(c.addr).SetJSON(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
-		filter := findFilter(c.filter)
-		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-			log.Debugf("上报Event %v 到 HTTP 服务器 %s 时被过滤.", c.addr, e.JSONBytes())
-			return
-		}
-	}
-
-	err := gout.POST(c.addr).SetJSON(e.JSONBytes()).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(e.JSONBytes())
+			_, err := mac.Write(m.Bytes())
 			if err != nil {
 				log.Error(err)
 				return nil
 			}
 			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
 		}
-		if c.apiPort != 0 {
-			h["X-API-Port"] = c.apiPort
-		}
 		return h
 	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
 		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
@@ -241,15 +154,44 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 			return nil
 		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
+	log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
 	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), 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}))
+}
+
+func (h httpContext) Get(k string) gjson.Result {
+	c := h.ctx
+	if q := c.Query(k); q != "" {
+		return gjson.Result{Type: gjson.String, Str: q}
+	}
+	if c.Request.Method == "POST" {
+		if h := c.Request.Header.Get("Content-Type"); h != "" {
+			if strings.Contains(h, "application/x-www-form-urlencoded") {
+				if p, ok := c.GetPostForm(k); ok {
+					return gjson.Result{Type: gjson.String, Str: p}
+				}
+			}
+			if strings.Contains(h, "application/json") {
+				if obj, ok := c.Get("json_body"); ok {
+					return obj.(gjson.Result).Get(k)
+				}
+			}
+		}
+	}
+	return gjson.Result{Type: gjson.Null, Str: ""}
+}
+
 func (s *httpServer) ShutDown() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

server/middlewares.go

@@ -1,91 +0,0 @@
-package server
-
-import (
-	"container/list"
-	"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]
-}
-
-func longPolling(bot *coolq.CQBot, maxSize int) handler {
-	var mutex sync.Mutex
-	cond := sync.NewCond(&mutex)
-	queue := list.New()
-	bot.OnEventPush(func(event *coolq.Event) {
-		mutex.Lock()
-		defer mutex.Unlock()
-		queue.PushBack(event.RawMsg)
-		for maxSize != 0 && queue.Len() > maxSize {
-			queue.Remove(queue.Front())
-		}
-		cond.Signal()
-	})
-	return func(action string, p resultGetter) coolq.MSG {
-		if action != "get_updates" {
-			return nil
-		}
-		mutex.Lock()
-		defer mutex.Unlock()
-		if queue.Len() == 0 {
-			cond.Wait()
-		}
-		limit := int(p.Get("limit").Int())
-		if limit <= 0 || queue.Len() < limit {
-			limit = queue.Len()
-		}
-		ret := make([]interface{}, limit)
-		for i := 0; i < limit; i++ {
-			ret[i] = queue.Remove(queue.Front())
-		}
-		return coolq.OK(ret)
-	}
-}

server/pprof.go

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

server/scf.go

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

server/websocket.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"net/http"
 	"runtime/debug"
@@ -12,7 +13,6 @@ 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"
@@ -21,92 +21,77 @@ import (
 )
 
 type webSocketServer struct {
-	bot  *coolq.CQBot
+	bot            *coolq.CQBot
-	conf *config.WebsocketServer
+	token          string
-
 	eventConn      []*webSocketConn
 	eventConnMutex sync.Mutex
-	token          string
 	handshake      string
-	filter         string
 }
 
-// websocketClient WebSocket客户端实例
+// WebSocketClient WebSocket客户端实例
-type websocketClient struct {
+type WebSocketClient struct {
-	bot  *coolq.CQBot
+	conf  *global.GoCQReverseWebSocketConfig
-	conf *config.WebsocketReverse
+	token string
+	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
 	},
 }
 
-// RunWebSocketServer 运行一个正向WS server
+func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
-func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
+	s.token = authToken
-	if conf.Disabled {
+	s.bot = b
-		return
-	}
-	s := &webSocketServer{
-		bot:    b,
-		conf:   conf,
-		token:  conf.AccessToken,
-		filter: conf.Filter,
-	}
-	addFilter(s.filter)
-	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
 	s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
-		b.Client.Uin, time.Now().Unix())
+		s.bot.Client.Uin, time.Now().Unix())
 	b.OnEventPush(s.onBotPushEvent)
-	mux := http.ServeMux{}
+	http.HandleFunc("/event", s.event)
-	mux.HandleFunc("/event", s.event)
+	http.HandleFunc("/api", s.api)
-	mux.HandleFunc("/api", s.api)
+	http.HandleFunc("/", s.any)
-	mux.HandleFunc("/", s.any)
 	go func() {
 		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-		log.Fatal(http.ListenAndServe(addr, &mux))
+		log.Fatal(http.ListenAndServe(addr, nil))
 	}()
 }
 
-// RunWebSocketClient 运行一个正向WS client
+// NewWebSocketClient 初始化一个NWebSocket客户端
-func RunWebSocketClient(b *coolq.CQBot, conf *config.WebsocketReverse) {
+func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
-	if conf.Disabled {
+	return &WebSocketClient{conf: conf, token: authToken, bot: b}
+}
+
+// Run 运行实例
+func (c *WebSocketClient) Run() {
+	if !c.conf.Enabled {
 		return
 	}
-	c := &websocketClient{
+	if c.conf.ReverseURL != "" {
-		bot:    b,
-		conf:   conf,
-		token:  conf.AccessToken,
-		filter: conf.Filter,
-	}
-	addFilter(c.filter)
-	if c.conf.Universal != "" {
 		c.connectUniversal()
 	} else {
-		if c.conf.API != "" {
+		if c.conf.ReverseAPIURL != "" {
 			c.connectAPI()
 		}
-		if c.conf.Event != "" {
+		if c.conf.ReverseEventURL != "" {
 			c.connectEvent()
 		}
 	}
 	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connectAPI() {
+func (c *WebSocketClient) connectAPI() {
-	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.API)
+	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
 	header := http.Header{
 		"X-Client-Role": []string{"API"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -115,25 +100,22 @@ func (c *websocketClient) connectAPI() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.API, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.API, err)
+		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
-		if c.conf.ReconnectInterval != 0 {
+		if c.conf.ReverseReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectAPI()
 		}
 		return
 	}
-	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.API)
+	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{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() {
+func (c *WebSocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.Event)
+	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Event"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -142,11 +124,11 @@ func (c *websocketClient) connectEvent() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Event, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.Event, err)
+		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
-		if c.conf.ReconnectInterval != 0 {
+		if c.conf.ReverseReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectEvent()
 		}
 		return
@@ -159,12 +141,12 @@ func (c *websocketClient) connectEvent() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
+	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
-	c.eventConn = &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 }
 
-func (c *websocketClient) connectUniversal() {
+func (c *WebSocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.Universal)
+	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Universal"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -173,11 +155,11 @@ func (c *websocketClient) connectUniversal() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Universal, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.Universal, err)
+		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
-		if c.conf.ReconnectInterval != 0 {
+		if c.conf.ReverseReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectUniversal()
 		}
 		return
@@ -189,15 +171,12 @@ func (c *websocketClient) connectUniversal() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{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) {
+func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
 	defer func() { _ = conn.Close() }()
 	for {
 		buffer := global.NewBuffer()
@@ -220,48 +199,56 @@ func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
 			global.PutBuffer(buffer)
 		}
 	}
-	if c.conf.ReconnectInterval != 0 {
+	if c.conf.ReverseReconnectInterval != 0 {
-		time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 		if !u {
 			go c.connectAPI()
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
+func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
-	filter := findFilter(c.filter)
+	if c.eventConn != nil {
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
-		log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
+		conn := c.eventConn
-		return
-	}
-	push := func(conn *webSocketConn, reconnect func()) {
-		log.Debugf("向WS服务器 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
 		conn.Lock()
 		defer conn.Unlock()
-		_ = conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
+		if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
-			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", conn.RemoteAddr().String(), err)
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
-			_ = conn.Close()
+			_ = c.eventConn.Close()
-			if c.conf.ReconnectInterval != 0 {
+			if c.conf.ReverseReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-				reconnect()
+				c.connectEvent()
 			}
 		}
 	}
-	if c.eventConn != nil {
-		push(c.eventConn, c.connectEvent)
-	}
 	if c.universalConn != nil {
-		push(c.universalConn, c.connectUniversal)
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		conn := c.universalConn
+		conn.Lock()
+		defer conn.Unlock()
+		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
+			_ = c.universalConn.Close()
+			if c.conf.ReverseReconnectInterval != 0 {
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				c.connectUniversal()
+			}
+		}
 	}
 }
 
 func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
+	if s.token != "" {
-	if status != http.StatusOK {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-		w.WriteHeader(status)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
-		return
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
@@ -277,7 +264,7 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 
 	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
@@ -285,11 +272,14 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
+	if s.token != "" {
-	if status != http.StatusOK {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-		w.WriteHeader(status)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
-		return
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
@@ -297,19 +287,19 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
-	if s.conf.RateLimit.Enabled {
-		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
-	}
 	go s.listenAPI(conn)
 }
 
 func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
+	if s.token != "" {
-	if status != http.StatusOK {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-		w.WriteHeader(status)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
-		return
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
@@ -323,10 +313,7 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{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()
@@ -364,8 +351,9 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 			_ = c.Close()
 		}
 	}()
-	j := gjson.Parse(utils.B2S(payload))
+	global.RateLimit(context.Background())
-	t := strings.TrimSuffix(j.Get("action").Str, "_async")
+	j := gjson.ParseBytes(payload)
+	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
 	ret := c.apiCaller.callAPI(t, j.Get("params"))
 	if j.Get("echo").Exists() {
@@ -376,32 +364,26 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	_ = c.WriteJSON(ret)
 }
 
-func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
+func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
 	s.eventConnMutex.Lock()
 	defer s.eventConnMutex.Unlock()
-
+	for i, l := 0, len(s.eventConn); i < l; i++ {
-	filter := findFilter(s.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-		log.Debugf("上报Event %s 到 WS客户端 时被过滤.", e.JSONBytes())
-		return
-	}
-	j := 0
-	for i := 0; i < len(s.eventConn); i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
 		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
+		if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
 			_ = conn.Close()
+			next := i + 1
+			if next >= l {
+				next = l - 1
+			}
+			s.eventConn[i], s.eventConn[next] = s.eventConn[next], s.eventConn[i]
+			s.eventConn = append(s.eventConn[:next], s.eventConn[next+1:]...)
+			i--
+			l--
 			conn = nil
 			continue
 		}
-		if i != j {
-			// i != j means that some connection has been closed.
-			// use a in-place removal to avoid copying.
-			s.eventConn[j] = conn
-		}
 		conn.Unlock()
-		j++
 	}
-	s.eventConn = s.eventConn[:j]
 }