1
0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-06-30 11:53:25 +00:00

Compare commits

..

162 Commits

Author SHA1 Message Date
efdd6bd16a style: move coolq.MSG to global package 2021-09-17 19:08:05 +08:00
6d19f07eb4 fix: incorrect unsafe usage in upstream lib
Updates #1070
2021-09-17 15:37:09 +08:00
760bb175c7 fix: incorrect del friend argument
Fixes #1070
2021-09-17 14:47:00 +08:00
4da5d9ebfb Merge pull request #1026 from Shigma/patch-3
enhance help
2021-09-16 19:42:59 +08:00
a6f82d85be fix #1058 2021-09-16 19:37:05 +08:00
c62f193005 Merge branch 'dev' of github.com:/Mrs4s/go-cqhttp into dev 2021-09-16 18:27:58 +08:00
f386a9b94e doc: delete_unidirectional_friend 2021-09-16 18:27:42 +08:00
48afb44287 Merge pull request #1050 from wdvxdr1123/avx2
feat: use avx2 base64
2021-09-16 18:24:44 +08:00
75fe0294ac fix: make lint happy 2021-09-16 18:19:49 +08:00
1290a3dd10 fix: unidirectional friend cache missing. 2021-09-16 18:08:45 +08:00
59209068bf feat: delete_unidirectional_friend. 2021-09-16 18:01:24 +08:00
757661bcf7 doc: get_unidirectional_friend_list. 2021-09-16 17:37:43 +08:00
b8bf3f9711 feat: get_unidirectional_friend_list api. 2021-09-16 17:33:38 +08:00
eadd688e5a doc: fix typo. 2021-09-16 17:22:04 +08:00
8c89d3c432 doc: image subtype. 2021-09-16 17:21:09 +08:00
cfaa18b131 fix: relogin error. 2021-09-16 17:11:38 +08:00
c975975e30 feat: group image subtype support. 2021-09-16 17:10:12 +08:00
ec4ecb1093 docs: fix newline in MINE 2021-09-16 16:48:17 +08:00
b01ea99d1a docs: MINE scan 2021-09-16 16:43:52 +08:00
8c94c810d6 fix relogin default value error. 2021-09-15 14:34:18 +08:00
7485b51c48 update retry message. 2021-09-15 13:45:04 +08:00
449ae96c8f fix env conf load. 2021-09-15 13:43:39 +08:00
7f26df3ac7 feat: use avx2 base64 2021-09-14 15:12:32 +08:00
bfea93312a fix: panic on setting servers.
Fixes #1039
2021-09-02 19:17:01 +08:00
f8dfa8db2c style: simply send msg. 2021-08-29 22:48:03 +08:00
74fd4bbf35 Merge pull request #1030 from 502647092/patch-1
fix: 修复环境变量初始化错误
2021-08-29 01:49:13 +08:00
16db68e054 Merge pull request #1022 from asjdf/master
update fs.go
2021-08-28 19:46:16 +08:00
346e01c4e9 fix: 修复环境变量初始化错误
Close #1025
2021-08-26 17:08:32 +08:00
a69d52821f Merge pull request #1027 from Yukari316/dev
fix /mark_msg_as_read api param type error
2021-08-25 22:31:48 +08:00
d70c2a0b70 Merge branch 'Mrs4s:dev' into dev 2021-08-25 22:30:06 +08:00
46d0d58865 feat: add nosilk tag.
Updates: #1024
2021-08-25 22:29:10 +08:00
d1ca68ed32 dep: drop jsoniter.
reduce binary size about 1 MB.
2021-08-25 22:25:59 +08:00
c8958b2a42 fix /mark_msg_as_read api param type error 2021-08-25 22:25:49 +08:00
d98ad55826 dep: drop jsoniter.
reduce binary size about 1 MB.
2021-08-25 16:24:35 +08:00
8ac460dde9 Update main.go 2021-08-25 15:17:58 +08:00
520cdd90bb fix #1023. 2021-08-24 09:41:26 +08:00
5fb3233a44 fix /send_group_forward_msg api unable to get params from non-json request. 2021-08-23 15:20:22 +08:00
c61a913c49 update fs.go 2021-08-23 14:02:51 +08:00
24c1192fa6 Merge pull request #1019 from Ink-33/alert
NoMoreDoubleClick
2021-08-22 15:56:28 +08:00
8773e19d2c style: remove useless code 2021-08-22 15:40:06 +08:00
8d6978a60d feat: alert windows user when double click 2021-08-22 15:05:14 +08:00
385443ee2d chore: update dependencies 2021-08-22 02:42:45 +08:00
7f0826b594 feat(server): support long polling timeout. 2021-08-21 12:55:01 +08:00
dc48958292 fix go mod. 2021-08-20 23:04:37 +08:00
e820a2a152 fix #1016. 2021-08-20 22:47:43 +08:00
022eb9fd3b all: bump go1.17 & support windows/arm64. 2021-08-18 14:01:31 +08:00
11a5dbb64a fix(coolq): wrong target on send music share.
Fixes: #1011
2021-08-18 13:25:56 +08:00
78d76f55e2 fix(scf): always flush the writer. 2021-08-16 16:05:33 +08:00
bf77951f8d Merge branch 'dev' 2021-08-15 02:55:42 +08:00
971cb5d854 fix lint. 2021-08-15 02:53:35 +08:00
e13a5bdad0 update doc & fix typo. 2021-08-15 02:51:32 +08:00
bf4f7fb41e fix lint. 2021-08-15 02:40:39 +08:00
eaa8154a33 update doc. 2021-08-15 02:37:51 +08:00
6240e875ce add: mark_msg_as_read api. 2021-08-15 02:36:11 +08:00
3c9433d7b7 remove: mark msg as read. 2021-08-15 02:22:47 +08:00
4b4193c6e3 feat: load leveldb conf from environment variable. close #1002 2021-08-15 02:15:33 +08:00
a1e3c57488 fix typo. 2021-08-15 01:58:43 +08:00
b43bdc1da5 update slider.md 2021-08-15 01:58:20 +08:00
aa46ab0119 add: session delete log. 2021-08-15 01:54:03 +08:00
92ad7d5938 fix(scf): fix write response. 2021-08-14 14:33:36 +08:00
ae04d26f51 Merge pull request #1005 from sam01101/dev.fix_time
修改错误的 `Timestamp`
2021-08-13 19:09:21 +08:00
d3b22a7a46 [Fix] Using timestamp from server 2021-08-13 18:55:04 +08:00
87d16f0e15 .github : update bug template. 2021-08-12 10:33:37 +08:00
c355549c8d fix(server): ws reverse reconnect. 2021-08-11 22:40:21 +08:00
75e82eaf35 fix(event): friend poke self. 2021-08-10 15:10:42 +08:00
4c8b2e9f13 drop cache file .cqimg. 2021-08-09 21:31:06 +08:00
84488f9bf1 remove message.ShortVideoElement in LocalVideoElement 2021-08-09 21:15:18 +08:00
5b705273c2 docs: fix typo (#998) 2021-08-09 13:38:49 +08:00
4bcfe9b8f1 feat: member special title updated event. 2021-08-09 06:17:12 +08:00
1863c44d11 update go.sum 2021-08-09 06:11:15 +08:00
c6f19016e1 update dep. 2021-08-09 06:11:04 +08:00
d88c30a3c7 update dep. 2021-08-09 06:08:04 +08:00
fd10f0d0aa doc: format & typo. 2021-08-07 23:05:44 +08:00
a6a666fe31 fix(config): panic on parsing env.
Fixes: #984
2021-08-07 19:07:10 +08:00
c423f6d6bb feat(coolq): new field "shut_up_timestamp" in group members.
Fixes: #918
2021-08-07 16:48:00 +08:00
605e572b87 feat(log): remove logrus-easy-formatter. 2021-08-07 12:56:49 +08:00
e506622399 feat(codec): enhance ffmpeg output with debug. 2021-08-07 12:04:32 +08:00
3326b2aa2f feat(coolq): mimetypes switch to array. 2021-08-06 22:31:27 +08:00
a38b86b763 Merge pull request #981 from fumiama/master
Fix: Image mime scan add type webp
2021-08-05 00:08:29 +08:00
b44f9545a8 fix(coolq): upload resources when send forward message.
Fixes: #987
2021-08-04 23:57:41 +08:00
38fff9bac0 Fix: Image mime scan add type webp 2021-08-03 23:52:27 +08:00
38865584ec update MiraiGo. 2021-08-03 15:39:40 +08:00
6c52734324 ci(chore): Fix stylings 2021-08-01 20:29:21 +00:00
a2f5be2166 feat: media mime scan. 2021-08-02 04:28:19 +08:00
cf307f455e doc: scf. 2021-08-01 21:41:01 +08:00
58d96004a3 perf(coolq): small change. 2021-08-01 21:41:00 +08:00
c951caba9f Merge branch 'dev' of github.com:/Mrs4s/go-cqhttp into dev 2021-08-01 06:29:37 +08:00
f4e38cb416 fix: go mod. 2021-08-01 06:29:10 +08:00
6fd104a8b9 perf(coolq): optimize CQCodeEscapeText. 2021-08-01 00:16:21 +08:00
86202d9d90 style: clean up io/ioutil.
rf '
  ex {
    import "io/ioutil";
    import "os";
    ioutil.WriteFile -> os.WriteFile
    ioutil.ReadFile -> os.ReadFile
  }
'
2021-07-29 15:18:50 +08:00
a3906a5d33 style: go1.17 fmt ./... 2021-07-28 19:29:48 +08:00
0be4c79d2c style: remove init func in main. 2021-07-28 19:21:25 +08:00
d705dd0617 chore(dep): update MiraiGo. 2021-07-26 18:34:29 +08:00
e5a8a406a4 clean send msg arg. 2021-07-26 18:11:57 +08:00
89eaf91371 fix(server): always send response. 2021-07-25 13:28:25 +08:00
19b2a86c7c fix golint. 2021-07-25 13:04:15 +08:00
e56e3b5036 feat(server): support serverless functions. 2021-07-25 12:41:57 +08:00
cdd2dcf907 feat(server): support http long polling. 2021-07-24 21:38:51 +08:00
6d5bf84603 simply makeShowPic. 2021-07-22 23:08:54 +08:00
7274a46a3c feat: add api port to HTTP post headers. 2021-07-18 23:04:06 +08:00
decab775f9 update dependencies. fix #935 2021-07-18 22:57:52 +08:00
cd4ac2078b fix token login. 2021-07-18 22:48:38 +08:00
04fad744a5 update dependencies. 2021-07-18 22:42:22 +08:00
d28e6f6e82 fix typo. 2021-07-18 18:28:46 +08:00
9c9a469a16 ci(chore): Fix stylings 2021-07-18 10:04:18 +00:00
d7e0aaf827 feat: environment config support. 2021-07-18 18:03:23 +08:00
0a5e172a4a update dependencies & fix resource leak. 2021-07-18 16:03:03 +08:00
4894731422 rf(message): refactor show pic&flash pic.
Fixes: #470
2021-07-18 11:42:36 +08:00
85df77f9a5 feat: log aging & force new log file. close #963 2021-07-17 22:58:45 +08:00
b68bb0762f update dependencies. 2021-07-17 22:41:35 +08:00
2db968bbe3 feat(server): use a in-place removal to clean closed ws conn. 2021-07-17 22:07:21 +08:00
426aa5718f fix: form parse.
Fixes: #960
2021-07-15 10:13:24 +08:00
54cef1fd37 fix: private reply message incorrect display in android.
Fixes: #814
2021-07-14 21:45:21 +08:00
3663c2aed8 fix: build tag. 2021-07-14 21:43:36 +08:00
ca93d4de0d fix: data race && cgo build. 2021-07-12 11:39:46 +08:00
c6994ade94 chore(ci): fix commit back. 2021-07-11 15:30:46 +08:00
f21730e879 chore(ci): clean workflows. 2021-07-10 23:47:17 +08:00
ca8d28f913 clean ws client push event. 2021-07-10 23:29:42 +08:00
34c22bed9c refactor(server): lazy marshal json. 2021-07-10 23:10:32 +08:00
9390503683 chore(dep): update dependencies. 2021-07-10 11:07:06 +08:00
ccc344ab1c fix(server): panic on multi ws server. 2021-07-09 22:45:30 +08:00
e768ff0dc2 refactor(coolq): clean forward media upload. 2021-07-09 22:40:44 +08:00
404c39eb53 refactor(coolq): clean media upload. 2021-07-09 11:15:36 +08:00
2f05775101 style: small code clean. 2021-07-08 23:01:03 +08:00
d266242887 clear check authorization. 2021-07-07 21:19:02 +08:00
e9b302ad74 chore(dep): update dep. 2021-07-07 21:11:25 +08:00
6042d451e9 Merge branch 'master' into dev 2021-07-07 20:13:05 +08:00
b5fbc6f2d5 Merge pull request #936 from remiliacn/patch-1
Fix: Typo.
2021-07-04 22:06:05 +08:00
4a15138767 Merge pull request #948 from yume233/master
缓存依赖,优化CI编译速度,增加手动触发
2021-07-04 22:05:47 +08:00
f6e5e28a7a 增加手动触发 2021-07-03 20:07:24 +08:00
5d00bd134d 增加依赖缓存 2021-07-03 20:04:12 +08:00
a894ee91bc 增加依赖缓存 2021-07-03 20:03:39 +08:00
8bfbfc04f3 缓存依赖,优化CI编译速度,增加手动触发 2021-07-03 17:55:46 +08:00
e8ddc1f140 fix log message with invalid forward node. 2021-07-03 16:21:31 +08:00
5cfd53fd8a fix custom reply element param name. 2021-07-03 16:17:18 +08:00
48b442a281 fix send_group_forward_msg response message. 2021-07-03 16:09:59 +08:00
ad7e53009d fix device lock. 2021-07-02 09:46:15 +08:00
a87d0e9f8f fix wrong channel closed in SetupMainSignalHandler (#939) 2021-06-29 19:43:20 +08:00
70558dc965 Merge pull request #938 from povsister/printstack 2021-06-26 14:53:51 +08:00
752c82e8d6 deal with pipe close error 2021-06-26 14:53:19 +08:00
e2cafbd7d6 添加无需额外配置直接打印stack的功能
*unix: kill -USR1 <gocq_pid>
windows: echo dumpstack >\\.\pipe\go-cqhttp-<pid>

stackdump将直接以<exec_name>.<pid>.stacks.<timestamp>.log
的文件名保存在当前工作目录下
2021-06-26 14:33:37 +08:00
6e18969f96 Misc: 视频在图片文件夹里太怪了所以改一下 2021-06-25 18:25:13 -05:00
60297d1a83 Fix: Typo.
实例里的`video`写成了`image`
2021-06-25 18:18:14 -05:00
499108cb1b refactor(server): unify http & ws-server Authorization 2021-06-24 20:18:38 +08:00
2bbc75672f fix(filter): add missed code. 2021-06-23 13:38:03 +08:00
bddada66dc Merge pull request #930 from synodriver/unchanged-dev
typo
2021-06-23 13:27:49 +08:00
ee3580039b typo 2021-06-23 13:06:23 +08:00
63e1508815 style(filter): clean dead code. 2021-06-19 21:27:51 +08:00
7c5bd64e9b rf(api): simply get user_id 2021-06-19 21:25:38 +08:00
a117d67286 style: clear filter. 2021-06-19 21:08:13 +08:00
f40ff22c0e fix #923. 2021-06-17 15:11:29 +08:00
edde0c212c Merge pull request #906 from Shigma/patch-1
向 README 中添加适当的空格
2021-06-16 16:01:11 +08:00
8eb4b0388f Merge pull request #907 from Shigma/patch-2
修改 README 中的几处拼写细节
2021-06-16 16:00:38 +08:00
fad3bf1314 fix: private image upload
Updates: #914
2021-06-11 13:45:31 +08:00
da23fc1403 fix image source. 2021-06-08 13:24:36 +08:00
2f267e1926 remove: delete_group_file api folder_id param. 2021-06-06 14:48:16 +08:00
37d846c190 fix: private message recall (#669)
Fixes: #669
2021-05-31 18:39:16 +08:00
9c17a3e1c8 Update README.md 2021-05-31 00:59:17 +08:00
9d44697dcd Update README.md 2021-05-31 00:54:23 +08:00
139f053c5b Fix: Image won't load in README.md 2021-05-31 00:35:28 +08:00
19fdd34b7f style: clean code 2021-05-30 14:38:08 +08:00
9f7e31766b refactor(server): replace gin with net/http
reduce binary size about 2M
2021-05-30 14:05:50 +08:00
50 changed files with 2539 additions and 1582 deletions

View File

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

View File

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

View File

@ -1,6 +1,6 @@
name: Lint
on: [push]
on: [push,pull_request,workflow_dispatch]
jobs:
golangci:
@ -12,7 +12,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@v2.1.3
with:
go-version: 1.16
go-version: 1.17
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
@ -24,7 +24,7 @@ jobs:
go test $(go list ./...)
- name: Commit back
if: github.repository_owner == 'Mrs4s'
if: ${{ github.repository_owner == 'Mrs4s' && !github.event.pull_request }}
continue-on-error: true
run: |
git config --local user.name 'github-actions[bot]'
@ -32,3 +32,9 @@ jobs:
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

View File

@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.16.2'
go-version: '1.17'
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2

View File

@ -1,29 +0,0 @@
name: Lint
on: [pull_request]
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Go environment
uses: actions/setup-go@v2.1.3
with:
go-version: 1.16
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
- name: Tests
run: |
go test $(go list ./...)
- name: Suggester
uses: reviewdog/action-suggester@v1
with:
tool_name: golangci-lint

View File

@ -38,6 +38,7 @@ builds:
- 386
- amd64
- arm
- arm64
goarm:
- 7
mod_timestamp: "{{ .CommitTimestamp }}"

View File

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

View File

@ -1,5 +1,7 @@
<p align="center">
<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>
<a href="https://ishkong.github.io/go-cqhttp-docs/">
<img src="https://user-images.githubusercontent.com/25968335/120111974-8abef880-c139-11eb-99cd-fa928348b198.png" width="200" height="200" alt="go-cqhttp">
</a>
</p>
<div align="center">
@ -42,14 +44,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
### 拓展支持
@ -66,9 +68,9 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
### 实现
<details>
<summary>已实现CQ码</summary>
<summary>已实现 CQ </summary>
#### 符合 Onebot 标准的 CQ 码
#### 符合 OneBot 标准的 CQ 码
| CQ 码 | 功能 |
| ------------ | --------------------------- |
@ -97,7 +99,7 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
[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 码 | 功能 |
| -------------- | --------------------------------- |
@ -120,9 +122,9 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
</details>
<details>
<summary>已实现API</summary>
<summary>已实现 API</summary>
#### 符合 Onebot 标准的 API
#### 符合 OneBot 标准的 API
| API | 功能 |
| ------------------------ | ---------------------- |
@ -182,7 +184,7 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
[重启 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 | 功能 |
| --------------------------- | ---------------------- |
@ -217,9 +219,9 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
</details>
<details>
<summary>已实现Event</summary>
<summary>已实现 Event</summary>
#### 符合 Onebot 标准的 Event部分 Event 比 Onebot 标准多上报几个字段,不影响使用)
#### 符合 OneBot 标准的 Event部分 Event 比 OneBot 标准多上报几个字段,不影响使用)
| 事件类型 | Event |
| -------- | ---------------- |
@ -285,4 +287,4 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
## 性能
在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.
在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

File diff suppressed because it is too large Load Diff

View File

@ -4,6 +4,7 @@ import (
"bytes"
"encoding/gob"
"encoding/hex"
"encoding/json"
"fmt"
"hash/crc32"
"io"
@ -13,38 +14,90 @@ import (
"sync"
"time"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/global/config"
"github.com/gabriel-vasile/mimetype"
"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"
)
var json = jsoniter.ConfigCompatibleWithStandardLibrary
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/global/config"
)
// CQBot CQBot结构体,存储Bot实例相关配置
type CQBot struct {
Client *client.QQClient
events []func(*bytes.Buffer)
lock sync.RWMutex
events []func(*Event)
db *leveldb.DB
friendReqCache sync.Map
tempSessionCache sync.Map
oneWayMsgCache sync.Map
}
// MSG 消息Map
type MSG map[string]interface{}
// Event 事件
type Event struct {
RawMsg global.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
// keep sync with /docs/file.md#MINE
var lawfulImageTypes = [...]string{
"image/bmp",
"image/gif",
"image/jpeg",
"image/png",
"image/webp",
}
var lawfulAudioTypes = [...]string{
"audio/aac",
"audio/aiff",
"audio/amr",
"audio/ape",
"audio/flac",
"audio/midi",
"audio/mp4",
"audio/mpeg",
"audio/ogg",
"audio/wav",
"audio/x-m4a",
}
// NewQQBot 初始化一个QQBot实例
func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
bot := &CQBot{
@ -82,6 +135,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
bot.Client.OnGroupNotify(bot.groupNotifyEvent)
bot.Client.OnFriendNotify(bot.friendNotifyEvent)
bot.Client.OnMemberSpecialTitleUpdated(bot.memberTitleUpdatedEvent)
bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
bot.Client.OnJoinGroup(bot.joinGroupEvent)
@ -108,7 +162,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
t := time.NewTicker(time.Second * time.Duration(i))
for {
<-t.C
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"time": time.Now().Unix(),
"self_id": bot.Client.Uin,
"post_type": "meta_event",
@ -122,14 +176,16 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
}
// OnEventPush 注册事件上报函数
func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
func (bot *CQBot) OnEventPush(f func(e *Event)) {
bot.lock.Lock()
bot.events = append(bot.events, f)
bot.lock.Unlock()
}
// GetMessage 获取给定消息id对应的消息
func (bot *CQBot) GetMessage(mid int32) MSG {
func (bot *CQBot) GetMessage(mid int32) global.MSG {
if bot.db != nil {
m := MSG{}
m := global.MSG{}
data, err := bot.db.Get(binary.ToBytes(mid), nil)
if err == nil {
err = gob.NewDecoder(bytes.NewReader(data)).Decode(&m)
@ -143,101 +199,96 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
}
// UploadLocalImageAsGroup 上传本地图片至群聊
func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
if img.Stream != nil {
return bot.Client.UploadGroupImage(groupCode, img.Stream)
func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
if img.File != "" {
f, err := os.Open(img.File)
if err != nil {
return nil, errors.Wrap(err, "open image error")
}
defer func() { _ = f.Close() }()
img.Stream = f
}
return bot.Client.UploadGroupImageByFile(groupCode, img.File)
if lawful, mime := IsLawfulImage(img.Stream); !lawful {
return nil, errors.New("image type error: " + mime)
}
i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
if i != nil {
i.Flash = img.Flash
i.EffectID = img.EffectID
}
return
}
// UploadLocalVideo 上传本地短视频至群聊
func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
if v.File != "" {
video, err := os.Open(v.File)
if err != nil {
return nil, err
}
defer video.Close()
hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
_, _ = video.Seek(0, io.SeekStart)
_, _ = v.thumb.Seek(0, io.SeekStart)
return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
}
return &v.ShortVideoElement, nil
}
// UploadLocalImageAsPrivate 上传本地图片至私聊
func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
if img.Stream != nil {
return bot.Client.UploadPrivateImage(userID, img.Stream)
}
// need update.
f, err := os.Open(img.File)
video, err := os.Open(v.File)
if err != nil {
return nil, err
}
defer f.Close()
return bot.Client.UploadPrivateImage(userID, f)
defer video.Close()
hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
_, _ = video.Seek(0, io.SeekStart)
_, _ = v.thumb.Seek(0, io.SeekStart)
return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
}
// UploadLocalImageAsPrivate 上传本地图片至私聊
func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
if img.File != "" {
f, err := os.Open(img.File)
if err != nil {
return nil, errors.Wrap(err, "open image error")
}
defer func() { _ = f.Close() }()
img.Stream = f
}
if lawful, mime := IsLawfulImage(img.Stream); !lawful {
return nil, errors.New("image type error: " + mime)
}
i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
if i != nil {
i.Flash = img.Flash
}
return
}
// SendGroupMessage 发送群消息
func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
newElem := make([]message.IMessageElement, 0, len(m.Elements))
group := bot.Client.FindGroup(groupID)
for _, elem := range m.Elements {
if i, ok := elem.(*LocalImageElement); ok {
gm, err := bot.UploadLocalImageAsGroup(groupID, i)
for _, e := range m.Elements {
switch i := e.(type) {
case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
i, err := bot.uploadMedia(i, groupID, true)
if err != nil {
log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
log.Warnf("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
continue
}
newElem = append(newElem, gm)
continue
}
if i, ok := elem.(*message.VoiceElement); ok {
gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
if err != nil {
log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*LocalVideoElement); ok {
gv, err := bot.UploadLocalVideo(groupID, i)
if err != nil {
log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*PokeElement); ok {
if group := bot.Client.FindGroup(groupID); group != nil {
e = i
case *PokeElement:
if group != nil {
if mem := group.FindMember(i.Target); mem != nil {
mem.Poke()
return 0
}
}
}
if i, ok := elem.(*GiftElement); ok {
return 0
case *GiftElement:
bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
return 0
}
if i, ok := elem.(*message.MusicShareElement); ok {
case *message.MusicShareElement:
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("@全体成员")
}
}
if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
newElem = append(newElem, message.NewText("@全体成员"))
continue
}
newElem = append(newElem, elem)
newElem = append(newElem, e)
}
if len(newElem) == 0 {
log.Warnf("群消息发送失败: 消息为空.")
@ -256,43 +307,23 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
// SendPrivateMessage 发送私聊消息
func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
newElem := make([]message.IMessageElement, 0, len(m.Elements))
for _, elem := range m.Elements {
if i, ok := elem.(*LocalImageElement); ok {
fm, err := bot.UploadLocalImageAsPrivate(target, i)
for _, e := range m.Elements {
switch i := e.(type) {
case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
i, err := bot.uploadMedia(i, target, false)
if err != nil {
log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
continue
}
newElem = append(newElem, fm)
continue
}
if i, ok := elem.(*PokeElement); ok {
e = i
case *PokeElement:
bot.Client.SendFriendPoke(i.Target)
return 0
}
if i, ok := elem.(*message.VoiceElement); ok {
fv, err := bot.Client.UploadPrivatePtt(target, bytes.NewReader(i.Data)) // todo: io.ReadSeeker
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 {
case *message.MusicShareElement:
bot.Client.SendFriendMusicShare(target, i)
return 0
}
newElem = append(newElem, elem)
newElem = append(newElem, e)
}
if len(newElem) == 0 {
log.Warnf("好友消息发送失败: 消息为空.")
@ -300,13 +331,31 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
}
m.Elements = newElem
bot.checkMedia(newElem)
// 单向好友是否存在
unidirectionalFriendExists := func() bool {
list, err := bot.Client.GetUnidirectionalFriendList()
if err != nil {
return false
}
for _, f := range list {
if f.Uin == target {
return true
}
}
return false
}
session, ok := bot.tempSessionCache.Load(target)
var id int32 = -1
if bot.Client.FindFriend(target) != nil { // 双向好友
switch {
case bot.Client.FindFriend(target) != nil: // 双向好友
msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil {
id = bot.InsertPrivateMessage(msg)
}
} else if session, ok := bot.tempSessionCache.Load(target); ok || groupID != 0 { // 临时会话
case ok || groupID != 0: // 临时会话
switch {
case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
log.Errorf("错误: 找不到群(%v)", groupID)
@ -331,12 +380,12 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
id = bot.InsertTempMessage(target, msg)
}
}
} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
case unidirectionalFriendExists(): // 单向好友
msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil {
id = bot.InsertPrivateMessage(msg)
}
} else {
default:
nickname := "Unknown"
if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
nickname = summaryInfo.Nickname
@ -348,7 +397,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
// InsertGroupMessage 群聊消息入数据库
func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
val := MSG{
val := global.MSG{
"message-id": m.Id,
"internal-id": m.InternalId,
"group": m.GroupCode,
@ -375,7 +424,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
// InsertPrivateMessage 私聊消息入数据库
func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
val := MSG{
val := global.MSG{
"message-id": m.Id,
"internal-id": m.InternalId,
"target": m.Target,
@ -401,10 +450,10 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
// InsertTempMessage 临时消息入数据库
func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
val := MSG{
val := global.MSG{
"message-id": m.Id,
// FIXME(InsertTempMessage) InternalId missing
"group": m.GroupCode,
"from-group": m.GroupCode,
"group-name": m.GroupName,
"target": target,
"sender": m.Sender,
@ -439,13 +488,15 @@ func (bot *CQBot) Release() {
}
}
func (bot *CQBot) dispatchEventMessage(m MSG) {
buf := global.NewBuffer()
func (bot *CQBot) dispatchEventMessage(m global.MSG) {
bot.lock.RLock()
defer bot.lock.RUnlock()
event := &Event{RawMsg: m}
wg := sync.WaitGroup{}
wg.Add(len(bot.events))
_ = json.NewEncoder(buf).Encode(m)
for _, f := range bot.events {
go func(fn func(*bytes.Buffer)) {
go func(fn func(*Event)) {
defer func() {
wg.Done()
if pan := recover(); pan != nil {
@ -454,7 +505,7 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
}()
start := time.Now()
fn(buf)
fn(event)
end := time.Now()
if end.Sub(start) > time.Second*5 {
log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
@ -462,12 +513,12 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
}(f)
}
wg.Wait()
global.PutBuffer(buf)
global.PutBuffer(event.buffer)
}
func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
cqm := ToStringMessage(m.Elements, m.GroupCode, true)
gm := MSG{
gm := global.MSG{
"anonymous": nil,
"font": 0,
"group_id": m.GroupCode,
@ -482,7 +533,7 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
}(),
"raw_message": cqm,
"self_id": bot.Client.Uin,
"sender": MSG{
"sender": global.MSG{
"age": 0,
"area": "",
"level": "",
@ -490,16 +541,16 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
"user_id": m.Sender.Uin,
},
"sub_type": "normal",
"time": time.Now().Unix(),
"time": m.Time,
"user_id": m.Sender.Uin,
}
if m.Sender.IsAnonymous() {
gm["anonymous"] = MSG{
gm["anonymous"] = global.MSG{
"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
"id": m.Sender.Uin,
"name": m.Sender.AnonymousInfo.AnonymousNick,
}
gm["sender"].(MSG)["nickname"] = "匿名消息"
gm["sender"].(global.MSG)["nickname"] = "匿名消息"
gm["sub_type"] = "anonymous"
} else {
group := bot.Client.FindGroup(m.GroupCode)
@ -517,19 +568,17 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
return nil
}
}
ms := gm["sender"].(MSG)
ms["role"] = func() string {
switch mem.Permission {
case client.Owner:
return "owner"
case client.Administrator:
return "admin"
case client.Member:
return "member"
default:
return "member"
}
}()
ms := gm["sender"].(global.MSG)
switch mem.Permission {
case client.Owner:
ms["role"] = "owner"
case client.Administrator:
ms["role"] = "admin"
case client.Member:
ms["role"] = "member"
default:
ms["role"] = "member"
}
ms["nickname"] = mem.Nickname
ms["card"] = mem.CardName
ms["title"] = mem.SpecialTitle
@ -548,8 +597,42 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
}
// ToJSON 生成JSON字符串
func (m MSG) ToJSON() string {
b, _ := json.Marshal(m)
return string(b)
func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group bool) (message.IMessageElement, error) {
switch m := raw.(type) {
case *LocalImageElement:
if group {
return bot.UploadLocalImageAsGroup(target, m)
}
return bot.UploadLocalImageAsPrivate(target, m)
case *message.VoiceElement:
if group {
return bot.Client.UploadGroupPtt(target, bytes.NewReader(m.Data))
}
return bot.Client.UploadPrivatePtt(target, bytes.NewReader(m.Data))
case *LocalVideoElement:
return bot.UploadLocalVideo(target, m)
}
return nil, errors.New("unsupported message element type")
}
// 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, ""
}
for _, lt := range lawfulImageTypes {
if t.Is(lt) {
return true, t.String()
}
}
return false, t.String()
}

View File

@ -3,13 +3,11 @@ package coolq
import (
"bytes"
"crypto/md5"
"encoding/base64"
"encoding/hex"
xml2 "encoding/xml"
"errors"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net/url"
"os"
@ -22,6 +20,7 @@ import (
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/gabriel-vasile/mimetype"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
@ -65,9 +64,11 @@ type GiftElement struct {
// LocalImageElement 本地图片
type LocalImageElement struct {
message.ImageElement
Stream io.ReadSeeker
File string
Flash bool
EffectID int32
}
// LocalVoiceElement 本地语音
@ -78,17 +79,26 @@ type LocalVoiceElement struct {
// LocalVideoElement 本地视频
type LocalVideoElement struct {
message.ShortVideoElement
File string
thumb io.ReadSeeker
}
// Type implements the message.IMessageElement.
func (e *LocalImageElement) Type() message.ElementType {
return message.Image
}
// Type 获取元素类型ID
func (e *GiftElement) Type() message.ElementType {
// Make message.IMessageElement Happy
return message.At
}
// Type impl message.IMessageElement
func (e *LocalVideoElement) Type() message.ElementType {
return message.Video
}
// GiftID 礼物ID数组
var GiftID = [...]message.GroupGift{
message.SweetWink,
@ -114,8 +124,8 @@ func (e *PokeElement) Type() message.ElementType {
}
// ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
r = make([]MSG, 0, len(e))
func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG) {
r = make([]global.MSG, 0, len(e))
m := &message.SendingMessage{Elements: e}
reply := m.FirstOrNil(func(e message.IMessageElement) bool {
_, ok := e.(*message.ReplyElement)
@ -128,10 +138,10 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
rid = replyElem.Sender
}
if ExtraReplyData {
r = append(r, MSG{
r = append(r, global.MSG{
"type": "reply",
"data": map[string]string{
"id": fmt.Sprint(toGlobalID(rid, replyElem.ReplySeq)),
"id": strconv.FormatInt(int64(toGlobalID(rid, replyElem.ReplySeq)), 10),
"seq": strconv.FormatInt(int64(replyElem.ReplySeq), 10),
"qq": strconv.FormatInt(replyElem.Sender, 10),
"time": strconv.FormatInt(int64(replyElem.Time), 10),
@ -139,104 +149,101 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
},
})
} else {
r = append(r, MSG{
r = append(r, global.MSG{
"type": "reply",
"data": map[string]string{"id": fmt.Sprint(toGlobalID(rid, replyElem.ReplySeq))},
"data": map[string]string{"id": strconv.FormatInt(int64(toGlobalID(rid, replyElem.ReplySeq)), 10)},
})
}
}
for i, elem := range e {
var m MSG
var m global.MSG
switch o := elem.(type) {
case *message.ReplyElement:
if RemoveReplyAt && len(e) > i+1 {
if RemoveReplyAt && i+1 < len(e) {
elem, ok := e[i+1].(*message.AtElement)
if ok && elem.Target == o.Sender {
e[i+1] = nil
}
}
case *message.TextElement:
m = MSG{
m = global.MSG{
"type": "text",
"data": map[string]string{"text": o.Content},
}
case *message.LightAppElement:
m = MSG{
m = global.MSG{
"type": "json",
"data": map[string]string{"data": o.Content},
}
case *message.AtElement:
if o.Target == 0 {
m = MSG{
m = global.MSG{
"type": "at",
"data": map[string]string{"qq": "all"},
}
} else {
m = MSG{
m = global.MSG{
"type": "at",
"data": map[string]string{"qq": fmt.Sprint(o.Target)},
"data": map[string]string{"qq": strconv.FormatInt(o.Target, 10)},
}
}
case *message.RedBagElement:
m = MSG{
m = global.MSG{
"type": "redbag",
"data": map[string]string{"title": o.Title},
}
case *message.ForwardElement:
m = MSG{
m = global.MSG{
"type": "forward",
"data": map[string]string{"id": o.ResId},
}
case *message.FaceElement:
m = MSG{
m = global.MSG{
"type": "face",
"data": map[string]string{"id": fmt.Sprint(o.Index)},
"data": map[string]string{"id": strconv.FormatInt(int64(o.Index), 10)},
}
case *message.VoiceElement:
m = MSG{
m = global.MSG{
"type": "record",
"data": map[string]string{"file": o.Name, "url": o.Url},
}
case *message.ShortVideoElement:
m = MSG{
m = global.MSG{
"type": "video",
"data": map[string]string{"file": o.Name, "url": o.Url},
}
case *message.ImageElement:
m = MSG{
"type": "image",
"data": map[string]string{"file": o.Filename, "url": o.Url},
}
case *message.GroupImageElement:
m = MSG{
data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url, "subType": strconv.FormatInt(int64(o.ImageBizType), 10)}
switch {
case o.Flash:
data["type"] = "flash"
case o.EffectID != 0:
data["type"] = "show"
data["id"] = strconv.FormatInt(int64(o.EffectID), 10)
}
m = global.MSG{
"type": "image",
"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
"data": data,
}
case *message.FriendImageElement:
m = MSG{
"type": "image",
"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
if o.Flash {
data["type"] = "flash"
}
case *message.GroupFlashImgElement:
return []MSG{{
m = global.MSG{
"type": "image",
"data": map[string]string{"file": o.Filename, "type": "flash"},
}}
case *message.FriendFlashImgElement:
return []MSG{{
"type": "image",
"data": map[string]string{"file": o.Filename, "type": "flash"},
}}
"data": data,
}
case *message.ServiceElement:
if isOk := strings.Contains(o.Content, "<?xml"); isOk {
m = MSG{
m = global.MSG{
"type": "xml",
"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
"data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)},
}
} else {
m = MSG{
m = global.MSG{
"type": "json",
"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
"data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)},
}
}
default:
@ -316,28 +323,29 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
} else {
write(`[CQ:video,file=%s,url=%s]`, o.Name, CQCodeEscapeValue(o.Url))
}
case *message.ImageElement:
if ur {
write(`[CQ:image,file=%s]`, o.Filename)
} else {
write(`[CQ:image,file=%s,url=%s]`, o.Filename, CQCodeEscapeValue(o.Url))
}
case *message.GroupImageElement:
var arg string
if o.Flash {
arg = ",type=flash"
} else if o.EffectID != 0 {
arg = ",type=show,id=" + strconv.FormatInt(int64(o.EffectID), 10)
}
arg += ",subType=" + strconv.FormatInt(int64(o.ImageBizType), 10)
if ur {
write("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
write("[CQ:image,file=%s%s]", hex.EncodeToString(o.Md5)+".image", arg)
} else {
write("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
write("[CQ:image,file=%s,url=%s%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url), arg)
}
case *message.FriendImageElement:
if ur {
write("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
} else {
write("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
var arg string
if o.Flash {
arg = ",type=flash"
}
if ur {
write("[CQ:image,file=%s%s]", hex.EncodeToString(o.Md5)+".image", arg)
} else {
write("[CQ:image,file=%s,url=%s%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url), arg)
}
case *message.GroupFlashImgElement:
return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
case *message.FriendFlashImgElement:
return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
case *message.ServiceElement:
if isOk := strings.Contains(o.Content, "<?xml"); isOk {
write(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
@ -371,7 +379,7 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
switch {
case customText != "":
var elem *message.ReplyElement
var org MSG
var org global.MSG
sender, senderErr := strconv.ParseInt(d["qq"], 10, 64)
if senderErr != nil && err != nil {
log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
@ -543,10 +551,10 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
switch {
case customText != "":
var elem *message.ReplyElement
var org MSG
sender, senderErr := strconv.ParseInt(e.Get("data.qq").String(), 10, 64)
var org global.MSG
sender, senderErr := strconv.ParseInt(e.Get("data.[user_id,qq]").String(), 10, 64)
if senderErr != nil && err != nil {
log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
log.Warnf("警告: 自定义 Reply 元素中必须包含 user_id 或 id")
break
}
msgTime, timeErr := strconv.ParseInt(e.Get("data.time").String(), 10, 64)
@ -668,38 +676,31 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
return nil, err
}
tp := d["type"]
if tp != "show" && tp != "flash" {
return img, nil
}
if i, ok := img.(*LocalImageElement); ok { // 秀图,闪照什么的就直接传了吧
if isGroup {
img, err = bot.UploadLocalImageAsGroup(1, i)
} else {
img, err = bot.UploadLocalImageAsPrivate(1, i)
}
if err != nil {
return nil, err
}
}
flash, id := false, int64(0)
switch tp {
case "flash":
if i, ok := img.(*message.GroupImageElement); ok {
return &message.GroupFlashPicElement{GroupImageElement: *i}, nil
}
if i, ok := img.(*message.FriendImageElement); ok {
return &message.FriendFlashPicElement{FriendImageElement: *i}, nil
}
flash = true
case "show":
id, _ := strconv.ParseInt(d["id"], 10, 64)
id, _ = strconv.ParseInt(d["id"], 10, 64)
if id < 40000 || id >= 40006 {
id = 40000
}
if i, ok := img.(*message.GroupImageElement); ok {
return &message.GroupShowPicElement{GroupImageElement: *i, EffectId: int32(id)}, nil
}
return img, nil
default:
return img, err
}
switch img := img.(type) {
case *LocalImageElement:
img.Flash = flash
img.EffectID = int32(id)
case *message.GroupImageElement:
img.Flash = flash
img.EffectID = int32(id)
i, _ := strconv.ParseInt(d["subType"], 10, 64)
img.ImageBizType = message.ImageBizType(i)
case *message.FriendImageElement:
img.Flash = flash
}
return img, err
case "poke":
t, _ := strconv.ParseInt(d["qq"], 10, 64)
return &PokeElement{Target: t}, nil
@ -734,6 +735,19 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
if err != nil {
return nil, err
}
if !SkipMimeScan && !global.IsAMRorSILK(data) {
mt := mimetype.Detect(data)
lawful := false
for _, lt := range lawfulAudioTypes {
if mt.Is(lt) {
lawful = true
break
}
}
if !lawful {
return nil, errors.New("audio type error: " + mt.String())
}
}
if !global.IsAMRorSILK(data) {
data, err = global.EncoderSilk(data)
if err != nil {
@ -835,7 +849,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
Summary: d["content"],
Url: d["url"],
PictureUrl: d["image"],
MusicUrl: d["purl"],
MusicUrl: d["audio"],
}, nil
}
xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="%s" src="%s"/><title>%s</title><summary>%s</summary></item><source name="音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
@ -893,7 +907,10 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
if err != nil {
return nil, err
}
v := file.(*LocalVideoElement)
v, ok := file.(*LocalVideoElement)
if !ok {
return file, nil
}
if v.File == "" {
return v, nil
}
@ -902,7 +919,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
data, _ = global.FindFile(cover, cache, global.ImagePath)
} else {
_ = global.ExtractCover(v.File, v.File+".jpg")
data, _ = ioutil.ReadFile(v.File + ".jpg")
data, _ = os.ReadFile(v.File + ".jpg")
}
v.thumb = bytes.NewReader(data)
video, _ := os.Open(v.File)
@ -934,13 +951,13 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
default:
return nil, errors.New("unsupported cq code: " + t)
}
return nil, nil
}
// XMLEscape 将字符串c转义为XML字符串
func XMLEscape(c string) string {
buf := new(bytes.Buffer)
_ = xml2.EscapeText(buf, []byte(c))
buf := global.NewBuffer()
defer global.PutBuffer(buf)
_ = xml2.EscapeText(buf, utils.S2B(c))
return buf.String()
}
@ -953,12 +970,39 @@ func XMLEscape(c string) string {
] -> &#93;
*/
func CQCodeEscapeText(raw string) string {
ret := raw
ret = strings.ReplaceAll(ret, "&", "&amp;")
ret = strings.ReplaceAll(ret, "[", "&#91;")
ret = strings.ReplaceAll(ret, "]", "&#93;")
return ret
func CQCodeEscapeText(s string) string {
count := strings.Count(s, "&")
count += strings.Count(s, "[")
count += strings.Count(s, "]")
if count == 0 {
return s
}
// Apply replacements to buffer.
var b strings.Builder
b.Grow(len(s) + count*4)
start := 0
for i := 0; i < count; i++ {
j := start
for index, r := range s[start:] {
if r == '&' || r == '[' || r == ']' {
j += index
break
}
}
b.WriteString(s[start:j])
switch s[j] {
case '&':
b.WriteString("&amp;")
case '[':
b.WriteString("&#91;")
case ']':
b.WriteString("&#93;")
}
start = j + 1
}
b.WriteString(s[start:])
return b.String()
}
/*CQCodeEscapeValue 将字符串value中部分字符转义
@ -1073,7 +1117,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
return &LocalImageElement{File: fu.Path}, nil
}
if strings.HasPrefix(f, "base64") && !video {
b, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(f, "base64://"))
b, err := global.Base64DecodeString(strings.TrimPrefix(f, "base64://"))
if err != nil {
return nil, err
}
@ -1086,16 +1130,16 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
return nil, errors.New("invalid video")
}
if path.Ext(rawPath) == ".video" {
b, _ := ioutil.ReadFile(rawPath)
b, _ := os.ReadFile(rawPath)
r := binary.NewReader(b)
return &LocalVideoElement{ShortVideoElement: message.ShortVideoElement{ // todo 检查缓存是否有效
return &message.ShortVideoElement{ // todo 检查缓存是否有效
Md5: r.ReadBytes(16),
ThumbMd5: r.ReadBytes(16),
Size: r.ReadInt32(),
ThumbSize: r.ReadInt32(),
Name: r.ReadString(),
Uuid: r.ReadAvailable(),
}}, nil
}, nil
}
return &LocalVideoElement{File: rawPath}, nil
}
@ -1104,72 +1148,50 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
exist = true
rawPath = path.Join(global.ImagePathOld, f)
}
if !exist && global.PathExists(rawPath+".cqimg") {
exist = true
rawPath += ".cqimg"
if !exist {
if d["url"] != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
}
return nil, errors.New("invalid image")
}
if !exist && d["url"] != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
if path.Ext(rawPath) != ".image" {
return &LocalImageElement{File: rawPath}, nil
}
if exist {
if path.Ext(rawPath) != ".image" && path.Ext(rawPath) != ".cqimg" {
return &LocalImageElement{File: rawPath}, nil
}
b, err := os.ReadFile(rawPath)
if err != nil {
return nil, err
}
if len(b) < 20 {
return nil, errors.New("invalid local file")
}
var (
size int32
hash []byte
imageURL string
)
if path.Ext(rawPath) == ".cqimg" {
for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
kv := strings.SplitN(line, "=", 2)
switch kv[0] {
case "md5":
hash, _ = hex.DecodeString(strings.ReplaceAll(kv[1], "\r", ""))
case "size":
t, _ := strconv.Atoi(strings.ReplaceAll(kv[1], "\r", ""))
size = int32(t)
}
}
} else {
r := binary.NewReader(b)
hash = r.ReadBytes(16)
size = r.ReadInt32()
r.ReadString()
imageURL = r.ReadString()
}
if size == 0 {
if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
}
return nil, errors.New("img size is 0")
}
if len(hash) != 16 {
return nil, errors.New("invalid hash")
}
var rsp message.IMessageElement
if group {
rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
goto ok
}
rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
ok:
if err != nil {
if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
}
return nil, err
}
return rsp, nil
b, err := os.ReadFile(rawPath)
if err != nil {
return nil, err
}
return nil, errors.New("invalid image")
if len(b) < 20 {
return nil, errors.New("invalid local file")
}
r := binary.NewReader(b)
hash := r.ReadBytes(16)
size := r.ReadInt32()
r.ReadString()
imageURL := r.ReadString()
if size == 0 {
if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
}
return nil, errors.New("img size is 0")
}
if len(hash) != 16 {
return nil, errors.New("invalid hash")
}
var rsp message.IMessageElement
if group {
rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
goto ok
}
rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
ok:
if err != nil {
if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
}
return nil, err
}
return rsp, nil
}
// makeShowPic 一种xml 方式发送的群消息图片
@ -1179,39 +1201,26 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, brief
if brief == "" {
brief = "&#91;分享&#93;我看到一张很赞的图片,分享给你,快来看!"
}
if i, ok := elem.(*LocalImageElement); ok {
if !group {
gm, err := bot.UploadLocalImageAsPrivate(1, i)
if err != nil {
log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
return nil, err
}
suf = gm
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
} else {
gm, err := bot.UploadLocalImageAsGroup(1, i)
if err != nil {
log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
return nil, err
}
suf = gm
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
if _, ok := elem.(*LocalImageElement); ok {
r := rand.Uint32()
e, err := bot.uploadMedia(elem, int64(r), group)
if err != nil {
log.Warnf("警告: 图片上传失败: %v", err)
return nil, err
}
elem = e
}
if i, ok := elem.(*message.GroupImageElement); ok {
switch i := elem.(type) {
case *message.GroupImageElement:
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
suf = i
case *message.FriendImageElement:
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
suf = i
}
if i, ok := elem.(*message.FriendImageElement); ok {
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
suf = i
if xml == "" {
return nil, errors.New("生成xml图片消息失败")
}
if xml != "" {
// log.Warn(xml)
ret := []message.IMessageElement{suf}
ret = append(ret, message.NewRichXml(xml, 5))
return ret, nil
}
return nil, errors.New("生成xml图片消息失败")
ret := []message.IMessageElement{suf, message.NewRichXml(xml, 5)}
return ret, nil
}

View File

@ -2,8 +2,11 @@ package coolq
import (
"fmt"
"strings"
"testing"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/stretchr/testify/assert"
"github.com/tidwall/gjson"
)
@ -15,8 +18,10 @@ func TestCQBot_ConvertStringMessage(t *testing.T) {
}
}
var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]&#93; 123 &#91;`
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":" ["}}]`)
var (
bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]&#93; 123 &#91;`
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++ {
@ -30,3 +35,32 @@ func BenchmarkCQBot_ConvertObjectMessage(b *testing.B) {
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))
}
}

View File

@ -2,7 +2,7 @@ package coolq
import (
"encoding/hex"
"io/ioutil"
"os"
"path"
"strconv"
"strings"
@ -36,15 +36,12 @@ func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...boo
func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
bot.checkMedia(m.Elements)
cqm := ToStringMessage(m.Elements, 0, true)
if !m.Sender.IsFriend {
bot.oneWayMsgCache.Store(m.Sender.Uin, "")
}
id := m.Id
if bot.db != nil {
id = bot.InsertPrivateMessage(m)
}
log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
fm := MSG{
fm := global.MSG{
"post_type": func() string {
if m.Sender.Uin == bot.Client.Uin {
return "message_sent"
@ -61,7 +58,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
"font": 0,
"self_id": c.Uin,
"time": time.Now().Unix(),
"sender": MSG{
"sender": global.MSG{
"user_id": m.Sender.Uin,
"nickname": m.Sender.Nickname,
"sex": "unknown",
@ -69,9 +66,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) {
@ -79,12 +73,12 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
for _, elem := range m.Elements {
if file, ok := elem.(*message.GroupFileElement); ok {
log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "group_upload",
"group_id": m.GroupCode,
"user_id": m.Sender.Uin,
"file": MSG{
"file": global.MSG{
"id": file.Path,
"name": file.Name,
"size": file.Size,
@ -109,9 +103,6 @@ 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) {
@ -124,7 +115,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
id = bot.InsertTempMessage(m.Sender.Uin, m)
}
log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
tm := MSG{
tm := global.MSG{
"post_type": "message",
"message_type": "private",
"sub_type": "group",
@ -136,7 +127,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
"font": 0,
"self_id": c.Uin,
"time": time.Now().Unix(),
"sender": MSG{
"sender": global.MSG{
"user_id": m.Sender.Uin,
"group_id": m.GroupCode,
"nickname": m.Sender.Nickname,
@ -167,7 +158,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
}
}
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"duration": e.Time,
"group_id": e.GroupCode,
@ -190,7 +181,7 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
gid := toGlobalID(e.GroupCode, e.MessageId)
log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"group_id": e.GroupCode,
"notice_type": "group_recall",
@ -209,7 +200,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
sender := group.FindMember(notify.Sender)
receiver := group.FindMember(notify.Receiver)
log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
@ -224,7 +215,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
sender := group.FindMember(notify.Sender)
luckyKing := group.FindMember(notify.LuckyKing)
log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
@ -237,7 +228,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
})
case *client.MemberHonorChangedNotifyEvent:
log.Info(notify.Content())
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
@ -268,8 +259,12 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
friend := c.FindFriend(e.From())
if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
log.Infof("好友 %v 戳了戳你.", friend.Nickname)
bot.dispatchEventMessage(MSG{
if notify.Receiver == notify.Sender {
log.Infof("好友 %v 戳了戳自己.", friend.Nickname)
} else {
log.Infof("好友 %v 戳了戳你.", friend.Nickname)
}
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "notify",
"sub_type": "poke",
@ -282,6 +277,22 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
}
}
func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSpecialTitleUpdatedEvent) {
group := c.FindGroup(e.GroupCode)
mem := group.FindMember(e.Uin)
log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.Name, group.Code, mem.DisplayName(), mem.Uin, e.NewTitle)
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "notify",
"sub_type": "title",
"group_id": group.Code,
"self_id": c.Uin,
"user_id": e.Uin,
"time": time.Now().Unix(),
"title": e.NewTitle,
})
}
func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
f := c.FindFriend(e.FriendUin)
gid := toGlobalID(e.FriendUin, e.MessageId)
@ -290,7 +301,7 @@ func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageR
} else {
log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
}
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "friend_recall",
"self_id": c.Uin,
@ -306,11 +317,11 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
return
}
log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "offline_file",
"user_id": e.Sender,
"file": MSG{
"file": global.MSG{
"name": e.FileName,
"size": e.FileSize,
"url": e.DownloadUrl,
@ -341,7 +352,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
}
return "unset"
}()
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "group_admin",
"sub_type": st,
@ -354,7 +365,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "group_card",
"group_id": e.Group.Code,
@ -384,7 +395,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
flag := strconv.FormatInt(e.RequestId, 10)
bot.friendReqCache.Store(flag, e)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "request",
"request_type": "friend",
"user_id": e.RequesterUin,
@ -398,7 +409,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.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "friend_add",
"self_id": c.Uin,
@ -410,7 +421,7 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
flag := strconv.FormatInt(e.RequestId, 10)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "request",
"request_type": "group",
"sub_type": "invite",
@ -426,7 +437,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
flag := strconv.FormatInt(e.RequestId, 10)
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "request",
"request_type": "group",
"sub_type": "add",
@ -445,11 +456,11 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
} else {
log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
}
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"notice_type": "client_status",
"online": e.Online,
"client": MSG{
"client": global.MSG{
"app_id": e.Client.AppId,
"device_name": e.Client.DeviceName,
"device_kind": e.Client.DeviceKind,
@ -482,7 +493,7 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
if e.OperatorUin == bot.Client.Uin {
return
}
bot.dispatchEventMessage(MSG{
bot.dispatchEventMessage(global.MSG{
"post_type": "notice",
"group_id": e.GroupCode,
"notice_type": "essence",
@ -500,8 +511,8 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
})
}
func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
return MSG{
func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
return global.MSG{
"post_type": "notice",
"notice_type": "group_increase",
"group_id": groupCode,
@ -513,8 +524,8 @@ func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
}
}
func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) MSG {
return MSG{
func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) global.MSG {
return global.MSG{
"post_type": "notice",
"notice_type": "group_decrease",
"group_id": groupCode,
@ -542,59 +553,26 @@ 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)
}), 0o644)
}
i.Filename = filename
case *message.GroupImageElement:
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) {
_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size))
w.WriteString(filename)
w.WriteString(i.ImageId)
w.WriteString(i.Url)
}), 0o644)
}
case *message.FriendImageElement:
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) {
_ = os.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.WriteUInt32(uint32(i.Size))
w.WriteString(i.ImageId)
w.WriteString(i.Url)
}), 0o644)
}
case *message.GroupFlashImgElement:
filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size))
w.WriteString(i.Filename)
w.WriteString("")
}), 0o644)
}
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("")
}), 0o644)
}
i.Filename = filename
case *message.VoiceElement:
i.Name = strings.ReplaceAll(i.Name, "{", "")
i.Name = strings.ReplaceAll(i.Name, "}", "")
@ -604,12 +582,12 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
continue
}
_ = ioutil.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
}
case *message.ShortVideoElement:
filename := hex.EncodeToString(i.Md5) + ".video"
if !global.PathExists(path.Join(global.VideoPath, filename)) {
_ = ioutil.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
_ = os.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.Write(i.ThumbMd5)
w.WriteUInt32(uint32(i.Size))

View File

@ -32,7 +32,6 @@ heartbeat:
# -1 为关闭心跳
interval: 5
message:
# 上报数据类型
# 可选: string,array
post-format: string
@ -48,6 +47,12 @@ message:
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
@ -119,6 +124,12 @@ servers:
host: 127.0.0.1
# pprof服务器监听端口
port: 7700
# LambdaServer 配置
- lambda:
type: scf # 可用 scf,aws (aws未经过测试)
middlewares:
<<: *default # 引用默认中间件
# 可添加更多
#- ws-reverse:
@ -143,6 +154,8 @@ database: # 数据库相关设置
> 注4关闭心跳服务可能引起断线请谨慎关闭
> 注5关于MINE扫描 详见[MINE](file.md#MINE)
## 在线状态
| 状态 | 值 |
@ -208,4 +221,15 @@ 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).

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@ import (
)
func TestVersionNameCompare(t *testing.T) {
var tests = [...]struct {
tests := [...]struct {
current string
remote string
expected bool

View File

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

View File

@ -2,8 +2,8 @@ package global
import (
"crypto/md5"
"fmt"
"io/ioutil"
"encoding/hex"
"os"
"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 := fmt.Sprintf("%x", h.Sum(nil))
tempName := hex.EncodeToString(h.Sum(nil))
if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
return ioutil.ReadFile(silkPath)
return os.ReadFile(silkPath)
}
slk, err := codec.EncodeToSilk(data, tempName, true)
if err != nil {

View File

@ -1,11 +1,12 @@
// +build linux windows,!arm darwin
//go:build (linux || (windows && !arm && !arm64) || darwin) && (386 || amd64 || arm || arm64) && !race && !nosilk
// +build linux windows,!arm,!arm64 darwin
// +build 386 amd64 arm arm64
// +build !race
// +build !nosilk
// Package codec Slik编码核心模块
package codec
import (
"io/ioutil"
"os"
"os/exec"
"path"
@ -14,15 +15,13 @@ 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 = ioutil.WriteFile(rawPath, record, os.ModePerm)
err = os.WriteFile(rawPath, record, os.ModePerm)
if err != nil {
return nil, errors.Wrap(err, "write temp file error")
}
@ -31,13 +30,17 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte
// 2.转换pcm
pcmPath := path.Join(silkCachePath, tempName+".pcm")
cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
if Debug {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
}
if err = cmd.Run(); err != nil {
return nil, errors.Wrap(err, "convert pcm file error")
}
defer os.Remove(pcmPath)
// 3. 转silk
pcm, err := ioutil.ReadFile(pcmPath)
pcm, err := os.ReadFile(pcmPath)
if err != nil {
return nil, errors.Wrap(err, "read pcm file err")
}
@ -47,7 +50,7 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte
}
if useCache {
silkPath := path.Join(silkCachePath, tempName+".silk")
err = ioutil.WriteFile(silkPath, silkWav, 0o666)
err = os.WriteFile(silkPath, silkWav, 0o666)
}
return
}

View File

@ -1,4 +1,5 @@
// +build !arm,!arm64,!amd64,!386
//go:build (!arm && !arm64 && !amd64 && !386) || (!windows && !linux && !darwin) || (windows && arm) || (windows && arm64) || race || nosilk
// +build !arm,!arm64,!amd64,!386 !windows,!linux,!darwin windows,arm windows,arm64 race nosilk
package codec

View File

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

View File

@ -1,13 +0,0 @@
package codec
import "errors"
// 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
}

2
global/codec/doc.go Normal file
View File

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

4
global/codec/stubs.go Normal file
View File

@ -0,0 +1,4 @@
package codec
// Debug mode controls the ffmpeg output.
var Debug bool

View File

@ -7,9 +7,12 @@ import (
"fmt"
"os"
"path"
"strconv"
"strings"
"sync"
"github.com/Mrs4s/go-cqhttp/global"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
)
@ -53,11 +56,14 @@ type Config struct {
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"`
Debug bool `yaml:"debug"`
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"`
@ -77,11 +83,15 @@ type MiddleWares struct {
// HTTPServer HTTP通信相关配置
type HTTPServer struct {
Disabled bool `yaml:"disabled"`
Host string `yaml:"host"`
Port int `yaml:"port"`
Timeout int32 `yaml:"timeout"`
Post []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"`
}
@ -116,6 +126,14 @@ type WebsocketReverse struct {
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"`
@ -129,15 +147,93 @@ var (
// Get 从默认配置文件路径中获取
func Get() *Config {
once.Do(func() {
hasEnvironmentConf := os.Getenv("GCQ_UIN") != ""
file, err := os.Open(DefaultConfigFile)
if err != nil {
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)
}
defer func() { _ = file.Close() }()
config = &Config{}
if err = yaml.NewDecoder(file).Decode(config); err != nil {
log.Fatal("配置文件不合法!", err)
if hasEnvironmentConf {
// 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_DISABLED"), true), 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))
dbConf := &LevelDBConfig{Enable: global.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)}
if config.Database == nil {
config.Database = make(map[string]yaml.Node)
}
config.Database["leveldb"] = func() yaml.Node {
n := &yaml.Node{}
_ = n.Encode(dbConf)
return *n
}()
accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
if os.Getenv("GCQ_HTTP_PORT") != "" {
node := &yaml.Node{}
httpConf := &HTTPServer{
Host: "0.0.0.0",
Port: 5700,
MiddleWares: MiddleWares{
AccessToken: accessTokenEnv,
},
}
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
@ -162,6 +258,7 @@ func generateConfig() {
> 2: 正向 Websocket 通信
> 3: 反向 Websocket 通信
> 4: pprof 性能分析服务器
> 5: 云函数服务
请输入你需要的编号,可输入多个,同一编号也可输入多个(如: 233)
您的选择是:`)
input := bufio.NewReader(os.Stdin)
@ -179,6 +276,8 @@ func generateConfig() {
sb.WriteString(wsReverseDefault)
case '4':
sb.WriteString(pprofDefault)
case '5':
sb.WriteString(lambdaDefault)
}
}
_ = os.WriteFile("config.yml", []byte(sb.String()), 0o644)
@ -195,6 +294,12 @@ const httpDefault = ` # HTTP 通信设置
# 反向HTTP超时时间, 单位秒
# 最小值为5小于5将会忽略本项设置
timeout: 5
# 长轮询拓展
long-polling:
# 是否开启
enabled: false
# 消息队列大小0 表示不限制队列大小,谨慎使用
max-queue-size: 2000
middlewares:
<<: *default # 引用默认中间件
# 反向HTTP POST地址列表
@ -205,6 +310,13 @@ const httpDefault = ` # HTTP 通信设置
# secret: '' # 密钥
`
const lambdaDefault = ` # LambdaServer 配置
- lambda:
type: scf # scf: 腾讯云函数 aws: aws Lambda
middlewares:
<<: *default # 引用默认中间件
`
const wsDefault = ` # 正向WS设置
- ws:
# 正向WS服务器监听地址

View File

@ -39,10 +39,16 @@ message:
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 # 开启调试模式

View File

@ -17,35 +17,33 @@ type operationNode struct {
filter Filter
}
// NotOperator 定义了过滤器中Not操作符
type NotOperator struct {
// notOperator 定义了过滤器中Not操作符
type notOperator struct {
operand Filter
}
func notOperatorConstruct(argument gjson.Result) *NotOperator {
func newNotOp(argument gjson.Result) Filter {
if !argument.IsObject() {
panic("the argument of 'not' operator must be an object")
}
op := new(NotOperator)
op.operand = Generate("and", argument)
return op
return &notOperator{operand: Generate("and", argument)}
}
// Eval 对payload执行Not过滤
func (op *NotOperator) Eval(payload gjson.Result) bool {
func (op *notOperator) Eval(payload gjson.Result) bool {
return !op.operand.Eval(payload)
}
// AndOperator 定义了过滤器中And操作符
type AndOperator struct {
// andOperator 定义了过滤器中And操作符
type andOperator struct {
operands []operationNode
}
func andOperatorConstruct(argument gjson.Result) *AndOperator {
func newAndOp(argument gjson.Result) Filter {
if !argument.IsObject() {
panic("the argument of 'and' operator must be an object")
}
op := new(AndOperator)
op := new(andOperator)
argument.ForEach(func(key, value gjson.Result) bool {
switch {
case key.Str[0] == '.':
@ -74,7 +72,7 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
}
// Eval 对payload执行And过滤
func (op *AndOperator) Eval(payload gjson.Result) bool {
func (op *andOperator) Eval(payload gjson.Result) bool {
res := true
for _, operand := range op.operands {
if len(operand.key) == 0 {
@ -93,16 +91,16 @@ func (op *AndOperator) Eval(payload gjson.Result) bool {
return res
}
// OrOperator 定义了过滤器中Or操作符
type OrOperator struct {
// orOperator 定义了过滤器中Or操作符
type orOperator struct {
operands []Filter
}
func orOperatorConstruct(argument gjson.Result) *OrOperator {
func newOrOp(argument gjson.Result) Filter {
if !argument.IsArray() {
panic("the argument of 'or' operator must be an array")
}
op := new(OrOperator)
op := new(orOperator)
argument.ForEach(func(_, value gjson.Result) bool {
op.operands = append(op.operands, Generate("and", value))
return true
@ -111,7 +109,7 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
}
// Eval 对payload执行Or过滤
func (op *OrOperator) Eval(payload gjson.Result) bool {
func (op *orOperator) Eval(payload gjson.Result) bool {
res := false
for _, operand := range op.operands {
res = res || operand.Eval(payload)
@ -122,49 +120,45 @@ func (op *OrOperator) Eval(payload gjson.Result) bool {
return res
}
// EqualOperator 定义了过滤器中Equal操作符
type EqualOperator struct {
// eqOperator 定义了过滤器中Equal操作符
type eqOperator struct {
operand string
}
func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
op := new(EqualOperator)
op.operand = argument.String()
return op
func newEqOp(argument gjson.Result) Filter {
return &eqOperator{operand: argument.String()}
}
// Eval 对payload执行Equal过滤
func (op *EqualOperator) Eval(payload gjson.Result) bool {
func (op *eqOperator) Eval(payload gjson.Result) bool {
return payload.String() == op.operand
}
// NotEqualOperator 定义了过滤器中NotEqual操作符
type NotEqualOperator struct {
// neqOperator 定义了过滤器中NotEqual操作符
type neqOperator struct {
operand string
}
func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
op := new(NotEqualOperator)
op.operand = argument.String()
return op
func newNeqOp(argument gjson.Result) Filter {
return &neqOperator{operand: argument.String()}
}
// Eval 对payload执行NotEqual过滤
func (op *NotEqualOperator) Eval(payload gjson.Result) bool {
func (op *neqOperator) Eval(payload gjson.Result) bool {
return !(payload.String() == op.operand)
}
// InOperator 定义了过滤器中In操作符
type InOperator struct {
// inOperator 定义了过滤器中In操作符
type inOperator struct {
operandString string
operandArray []string
}
func inOperatorConstruct(argument gjson.Result) *InOperator {
func newInOp(argument gjson.Result) Filter {
if argument.IsObject() {
panic("the argument of 'in' operator must be an array or a string")
}
op := new(InOperator)
op := new(inOperator)
if argument.IsArray() {
op.operandArray = []string{}
argument.ForEach(func(_, value gjson.Result) bool {
@ -178,7 +172,7 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
}
// Eval 对payload执行In过滤
func (op *InOperator) Eval(payload gjson.Result) bool {
func (op *inOperator) Eval(payload gjson.Result) bool {
payloadStr := payload.String()
if op.operandArray != nil {
for _, value := range op.operandArray {
@ -191,64 +185,59 @@ func (op *InOperator) Eval(payload gjson.Result) bool {
return strings.Contains(op.operandString, payloadStr)
}
// ContainsOperator 定义了过滤器中Contains操作符
type ContainsOperator struct {
// containsOperator 定义了过滤器中Contains操作符
type containsOperator struct {
operand string
}
func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
func newContainOp(argument gjson.Result) Filter {
if argument.IsArray() || argument.IsObject() {
panic("the argument of 'contains' operator must be a string")
}
op := new(ContainsOperator)
op.operand = argument.String()
return op
return &containsOperator{operand: argument.String()}
}
// Eval 对payload执行Contains过滤
func (op *ContainsOperator) Eval(payload gjson.Result) bool {
func (op *containsOperator) Eval(payload gjson.Result) bool {
return strings.Contains(payload.String(), op.operand)
}
// RegexOperator 定义了过滤器中Regex操作符
type RegexOperator struct {
// regexOperator 定义了过滤器中Regex操作符
type regexOperator struct {
regex *regexp.Regexp
}
func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
func newRegexOp(argument gjson.Result) Filter {
if argument.IsArray() || argument.IsObject() {
panic("the argument of 'regex' operator must be a string")
}
op := new(RegexOperator)
op.regex = regexp.MustCompile(argument.String())
return op
return &regexOperator{regex: regexp.MustCompile(argument.String())}
}
// Eval 对payload执行RegexO过滤
func (op *RegexOperator) Eval(payload gjson.Result) bool {
matched := op.regex.MatchString(payload.String())
return matched
func (op *regexOperator) Eval(payload gjson.Result) bool {
return op.regex.MatchString(payload.String())
}
// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
func Generate(opName string, argument gjson.Result) Filter {
switch opName {
case "not":
return notOperatorConstruct(argument)
return newNotOp(argument)
case "and":
return andOperatorConstruct(argument)
return newAndOp(argument)
case "or":
return orOperatorConstruct(argument)
case "neq":
return notEqualOperatorConstruct(argument)
return newOrOp(argument)
case "eq":
return equalOperatorConstruct(argument)
return newEqOp(argument)
case "neq":
return newNeqOp(argument)
case "in":
return inOperatorConstruct(argument)
return newInOp(argument)
case "contains":
return containsOperatorConstruct(argument)
return newContainOp(argument)
case "regex":
return regexOperatorConstruct(argument)
return newRegexOp(argument)
default:
panic("the operator " + opName + " is not supported")
}

View File

@ -3,10 +3,8 @@ package global
import (
"bytes"
"crypto/md5"
"encoding/base64"
"encoding/hex"
"errors"
"io/ioutil"
"net"
"net/url"
"os"
@ -46,12 +44,12 @@ var (
// PathExists 判断给定path是否存在
func PathExists(path string) bool {
_, err := os.Stat(path)
return err == nil || os.IsExist(err)
return err == nil || errors.Is(err, os.ErrExist)
}
// ReadAllText 读取给定path对应文件无法读取时返回空值
func ReadAllText(path string) string {
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
log.Error(err)
return ""
@ -61,7 +59,7 @@ func ReadAllText(path string) string {
// WriteAllText 将给定text写入给定path
func WriteAllText(path, text string) error {
return ioutil.WriteFile(path, utils.S2B(text), 0o644)
return os.WriteFile(path, utils.S2B(text), 0o644)
}
// Check 检测err是否为nil
@ -91,15 +89,15 @@ func FindFile(file, cache, p string) (data []byte, err error) {
hash := md5.Sum([]byte(file))
cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
if PathExists(cacheFile) && cache == "1" {
return ioutil.ReadFile(cacheFile)
return os.ReadFile(cacheFile)
}
data, err = GetBytes(file)
_ = ioutil.WriteFile(cacheFile, data, 0o644)
_ = os.WriteFile(cacheFile, data, 0o644)
if err != nil {
return nil, err
}
case strings.HasPrefix(file, "base64"):
data, err = base64.StdEncoding.DecodeString(strings.TrimPrefix(file, "base64://"))
data, err = Base64DecodeString(strings.TrimPrefix(file, "base64://"))
if err != nil {
return nil, err
}
@ -112,12 +110,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 = ioutil.ReadFile(fu.Path)
data, err = os.ReadFile(fu.Path)
if err != nil {
return nil, err
}
case PathExists(path.Join(p, file)):
data, err = ioutil.ReadFile(path.Join(p, file))
data, err = os.ReadFile(path.Join(p, file))
if err != nil {
return nil, err
}
@ -140,7 +138,7 @@ func DelFile(path string) bool {
// ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
func ReadAddrFile(path string) []*net.TCPAddr {
d, err := ioutil.ReadFile(path)
d, err := os.ReadFile(path)
if err != nil {
return nil
}

View File

@ -6,6 +6,7 @@ import (
"os"
"path/filepath"
"reflect"
"strings"
"sync"
"github.com/sirupsen/logrus"
@ -174,3 +175,21 @@ func GetLogLevel(level string) []logrus.Level {
}
}
}
// LogFormat specialize for go-cqhttp
type LogFormat struct{}
// Format implements logrus.Formatter
func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
buf := NewBuffer()
defer PutBuffer(buf)
buf.WriteByte('[')
buf.WriteString(entry.Time.Format("2006-01-02 15:04:05"))
buf.WriteString("] [")
buf.WriteString(strings.ToUpper(entry.Level.String()))
buf.WriteString("]: ")
buf.WriteString(entry.Message)
buf.WriteString(" \n")
ret := append([]byte(nil), buf.Bytes()...) // copy buffer
return ret, nil
}

View File

@ -2,26 +2,20 @@ package global
import (
"math"
"reflect"
"regexp"
"strconv"
"strings"
"sync"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/segmentio/asm/base64"
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": {},
}
// MSG 消息Map
type MSG map[string]interface{}
// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
//
@ -41,27 +35,28 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
if !j.Exists() {
return defaultVal
}
if j.Type == gjson.True {
switch j.Type { // nolint
case gjson.True:
return true
}
if j.Type == gjson.False {
case gjson.False:
return false
}
if j.Type != gjson.String {
case gjson.String:
str = j.Str
default:
return defaultVal
}
str = j.Str
} else if s, ok := p.(string); ok {
str = s
}
str = strings.ToLower(str)
if _, ok := trueSet[str]; ok {
switch str {
case "true", "yes", "1":
return true
}
if _, ok := falseSet[str]; ok {
case "false", "no", "0":
return false
default:
return defaultVal
}
return defaultVal
}
// VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
@ -99,6 +94,40 @@ func VersionNameCompare(current, remote string) bool {
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
}
v = v.Elem()
if v.Interface() != defaultValue {
return
}
if v.Kind() != v2.Kind() {
return
}
v.Set(v2)
}
// SetExcludeDefault 在目标值 value 不为默认值 defaultValue 时修改 variable 为 value
func SetExcludeDefault(variable, value, defaultValue interface{}) {
v := reflect.ValueOf(variable)
v2 := reflect.ValueOf(value)
if v.Kind() != reflect.Ptr || v.IsNil() {
return
}
v = v.Elem()
if reflect.Indirect(v2).Interface() != defaultValue {
return
}
if v.Kind() != v2.Kind() {
return
}
v.Set(v2)
}
var (
// once lazy compile the reg
once sync.Once
@ -128,3 +157,13 @@ func SplitURL(s string) []string {
result = append(result, s[last:])
return result
}
// Base64DecodeString decode base64 with avx2
// see https://github.com/segmentio/asm/issues/50
// avoid incorrect unsafe usage in origin library
func Base64DecodeString(s string) ([]byte, error) {
e := base64.StdEncoding
dst := make([]byte, e.DecodedLen(len(s)))
n, err := e.Decode(dst, utils.S2B(s))
return dst[:n], err
}

52
global/signal.go Normal file
View File

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

34
global/signal_unix.go Normal file
View File

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

89
global/signal_windows.go Normal file
View File

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

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package terminal
@ -6,3 +7,8 @@ package terminal
func RunningByDoubleClick() bool {
return false
}
// NoMoreDoubleClick 提示用户不要双击运行非Windows系统永远返回nil
func NoMoreDoubleClick() error {
return nil
}

View File

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

View File

@ -7,7 +7,6 @@ import (
"fmt"
"hash"
"io"
"io/ioutil"
"os"
"path/filepath"
@ -42,7 +41,7 @@ func FromStream(updateWith io.Reader) (err error, errRecover error) {
// no patch to apply, go on through
bufBytes := bufio.NewReader(updateWith)
updateWith = io.Reader(bufBytes)
newBytes, err = ioutil.ReadAll(updateWith)
newBytes, err = io.ReadAll(updateWith)
if err != nil {
return
}

View File

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

55
go.mod
View File

@ -1,33 +1,56 @@
module github.com/Mrs4s/go-cqhttp
go 1.16
go 1.17
replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0
require (
github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
github.com/Mrs4s/MiraiGo v0.0.0-20210525010101-8f0cd9494d64
github.com/Microsoft/go-winio v0.5.0
github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82
github.com/dustin/go-humanize v1.0.0
github.com/gin-contrib/pprof v1.3.0
github.com/gin-gonic/gin v1.7.1
github.com/gabriel-vasile/mimetype v1.3.1
github.com/gorilla/websocket v1.4.2
github.com/guonaihong/gout v0.1.9
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/json-iterator/go v1.1.10
github.com/guonaihong/gout v0.2.4
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/lestrrat-go/strftime v1.0.4 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/pkg/errors v0.9.1
github.com/segmentio/asm v1.0.0
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.7.5
github.com/tidwall/gjson v1.8.1
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
github.com/willf/bitset v1.1.11 // indirect
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
golang.org/x/term v0.0.0-20210422114643-f5beecf764ed
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
github.com/google/uuid v1.1.1 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
github.com/lestrrat-go/strftime v1.0.5 // indirect
github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/tidwall/match v1.0.3 // indirect
github.com/tidwall/pretty v1.1.0 // indirect
github.com/willf/bitset v1.2.0 // indirect
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
modernc.org/libc v1.8.1 // indirect
modernc.org/mathutil v1.2.2 // indirect
modernc.org/memory v1.0.4 // indirect
)

88
go.sum
View File

@ -2,8 +2,12 @@ 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/Mrs4s/MiraiGo v0.0.0-20210525010101-8f0cd9494d64 h1:36RqrFJS7TCicTLc995qgJI5NDFy93YR/zrqn4GI6nQ=
github.com/Mrs4s/MiraiGo v0.0.0-20210525010101-8f0cd9494d64/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E=
github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww=
github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -14,21 +18,17 @@ 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/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
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/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.7.1 h1:qC89GU3p8TvKWMAVhEpmpB2CIb1hnqt2UdKZaP93mS8=
github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU=
github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
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=
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@ -42,16 +42,15 @@ 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.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -60,26 +59,26 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/guonaihong/gout v0.1.9 h1:splZ4PPe5Ju40akL29drcTmG75TLtzqVlBv7GeoCzH8=
github.com/guonaihong/gout v0.1.9/go.mod h1:JkjNv1G2oRWvFgP/r4DUbYhoeIBB0zMP2j1ID+5CYpU=
github.com/guonaihong/gout v0.2.4 h1:BlWpWWay/Q1LkyIwupEWBZE3PMl4xzzAgMHw+OrZxBs=
github.com/guonaihong/gout v0.2.4/go.mod h1:ISabiAAj0z1h3bOFUKzfRqPMvX0wmcYzIh6i4xIxMPo=
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 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE=
github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
@ -88,9 +87,8 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@ -104,13 +102,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/segmentio/asm v1.0.0 h1:GMF7/2eLkte13LERSOmPI766AJXJDRlsqqiN8T7Mfmk=
github.com/segmentio/asm v1.0.0/go.mod h1:4EUJGaKsB8ImLUwOGORVsNd9vTRDeh44JGsY4aKp5I4=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@ -118,10 +117,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/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.7.5 h1:zmAN/xmX7OtpAkv4Ovfso60r/BiCi5IErCDYGNJu+uc=
github.com/tidwall/gjson v1.7.5/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
@ -134,13 +131,13 @@ 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-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/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=
@ -151,32 +148,38 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-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-20210422114643-f5beecf764ed h1:Ei4bQjjpYUsS4efOUz+5Nz++IVkHk87n2zBA0NxBWc0=
golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@ -198,12 +201,11 @@ 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/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=
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

View File

@ -3,7 +3,6 @@ package main
import (
"bufio"
"bytes"
"io/ioutil"
"os"
"strings"
"time"
@ -63,9 +62,13 @@ func qrcodeLogin() error {
if err != nil {
return err
}
_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0o644)
_ = os.WriteFile("qrcode.png", rsp.ImageData, 0o644)
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)
@ -114,26 +117,14 @@ func loginResponseProcessor(res *client.LoginResponse) error {
var text string
switch res.Error {
case client.SliderNeededError:
log.Warnf("登录需要滑条验证码. ")
log.Warnf("请参考文档 -> https://docs.go-cqhttp.org/faq/slider.html <- 进行处理")
log.Warnf("1. 自行抓包并获取 Ticket 输入.")
log.Warnf("2. 使用手机QQ扫描二维码登入. (推荐)")
log.Warn("请输入(1 - 2) (将在10秒后自动选择2)")
text = readLineTimeout(time.Second*10, "2")
if strings.Contains(text, "1") {
println()
log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
println()
log.Warn("请输入Ticket (Enter 提交)")
text = readLine()
res, err = cli.SubmitTicket(text)
continue
}
log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
cli.Disconnect()
cli.Release()
cli = client.NewClientEmpty()
return qrcodeLogin()
case client.NeedCaptcha:
log.Warnf("登录需要验证码.")
_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
log.Warnf("请输入验证码 (captcha.jpg) (Enter 提交)")
text = readLine()
global.DelFile("captcha.jpg")

222
main.go
View File

@ -8,19 +8,18 @@ import (
"encoding/hex"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"os/signal"
"path"
"path/filepath"
"runtime"
"strings"
"sync"
"syscall"
"time"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/global/codec"
"github.com/Mrs4s/go-cqhttp/global/config"
"github.com/Mrs4s/go-cqhttp/global/terminal"
"github.com/Mrs4s/go-cqhttp/global/update"
@ -31,7 +30,6 @@ import (
"github.com/guonaihong/gout"
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
log "github.com/sirupsen/logrus"
easy "github.com/t-tomalak/logrus-easy-formatter"
"github.com/tidwall/gjson"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/term"
@ -40,11 +38,6 @@ import (
var (
conf *config.Config
isFastStart = false
c string
d bool
h bool
wd string // reset work dir
// PasswordHash 存储QQ密码哈希供登录使用
PasswordHash [16]byte
@ -61,70 +54,67 @@ var (
}
)
func init() {
var debug bool
flag.StringVar(&c, "c", config.DefaultConfigFile, "configuration filename default is config.hjson")
flag.BoolVar(&d, "d", false, "running as a daemon")
flag.BoolVar(&debug, "D", false, "debug mode")
flag.BoolVar(&h, "h", false, "this help")
flag.StringVar(&wd, "w", "", "cover the working directory")
func main() {
c := flag.String("c", config.DefaultConfigFile, "configuration filename")
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()
// 通过-c 参数替换 配置文件路径
config.DefaultConfigFile = c
logFormatter := &easy.Formatter{
TimestampFormat: "2006-01-02 15:04:05",
LogFormat: "[%time%] [%lvl%]: %msg% \n",
switch {
case *h:
help()
case *d:
server.Daemon()
case *wd != "":
resetWorkDir(*wd)
}
w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
// 通过-c 参数替换 配置文件路径
config.DefaultConfigFile = *c
conf = config.Get()
if *debug {
conf.Output.Debug = true
}
if conf.Output.Debug {
log.SetReportCaller(true)
codec.Debug = true
}
rotateOptions := []rotatelogs.Option{
rotatelogs.WithRotationTime(time.Hour * 24),
}
if conf.Output.LogAging > 0 {
rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(time.Hour*24*time.Duration(conf.Output.LogAging)))
} else {
rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(time.Hour*24*365*10))
}
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)
}
conf = config.Get()
if debug {
conf.Output.Debug = true
}
// 在debug模式下,将在标准输出中打印当前执行行数
if conf.Output.Debug {
log.SetReportCaller(true)
}
log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...))
log.AddHook(global.NewLocalHook(w, global.LogFormat{}, global.GetLogLevel(conf.Output.LogLevel)...))
if !global.PathExists(global.ImagePath) {
if err := os.MkdirAll(global.ImagePath, 0o755); err != nil {
log.Fatalf("创建图片缓存文件夹失败: %v", err)
mkCacheDir := func(path string, _type string) {
if !global.PathExists(path) {
if err := os.MkdirAll(path, 0o755); err != nil {
log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
}
}
}
if !global.PathExists(global.VoicePath) {
if err := os.MkdirAll(global.VoicePath, 0o755); err != nil {
log.Fatalf("创建语音缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.VideoPath) {
if err := os.MkdirAll(global.VideoPath, 0o755); err != nil {
log.Fatalf("创建视频缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.CachePath) {
if err := os.MkdirAll(global.CachePath, 0o755); err != nil {
log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
}
}
}
mkCacheDir(global.ImagePath, "图片")
mkCacheDir(global.VoicePath, "语音")
mkCacheDir(global.VideoPath, "视频")
mkCacheDir(global.CachePath, "发送图片")
func main() {
if h {
help()
}
if d {
server.Daemon()
}
if wd != "" {
resetWorkDir()
}
var byteKey []byte
arg := os.Args
if len(arg) > 1 {
@ -146,9 +136,12 @@ func main() {
}
}
if terminal.RunningByDoubleClick() && !isFastStart {
log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
log.Warning("将等待10s后启动")
time.Sleep(time.Second * 10)
err := terminal.NoMoreDoubleClick()
if err != nil {
log.Errorf("遇到错误: %v", err)
time.Sleep(time.Second * 5)
}
return
}
if (conf.Account.Uin == 0 || (conf.Account.Password == "" && !conf.Account.Encrypt)) && !global.PathExists("session.token") {
@ -169,7 +162,7 @@ func main() {
if !global.PathExists("device.json") {
log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
client.GenRandomDevice()
_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
log.Info("已生成设备信息并保存到 device.json 文件.")
} else {
log.Info("将使用 device.json 内的设备信息运行Bot.")
@ -250,46 +243,16 @@ func main() {
}
return "未知"
}())
cli = client.NewClientEmpty()
if conf.Account.Uin != 0 && PasswordHash != [16]byte{} {
cli.Uin = conf.Account.Uin
cli.PasswordMd5 = PasswordHash
}
cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
switch e.Type {
case "INFO":
log.Info("Protocol -> " + e.Message)
case "ERROR":
log.Error("Protocol -> " + e.Message)
case "DEBUG":
log.Debug("Protocol -> " + e.Message)
}
})
if global.PathExists("address.txt") {
log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
addr := global.ReadAddrFile("address.txt")
if len(addr) > 0 {
cli.SetCustomServer(addr)
}
log.Infof("读取到 %v 个自定义地址.", len(addr))
}
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
if !conf.Account.UseSSOAddress {
log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
return false
}
log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
return true
})
cli = newClient()
global.Proxy = conf.Message.ProxyRewrite
isQRCodeLogin := (conf.Account.Uin == 0 || len(conf.Account.Password) == 0) && !conf.Account.Encrypt
isTokenLogin := false
saveToken := func() {
AccountToken = cli.GenToken()
_ = ioutil.WriteFile("session.token", AccountToken, 0o677)
_ = os.WriteFile("session.token", AccountToken, 0o644)
}
if global.PathExists("session.token") {
token, err := ioutil.ReadFile("session.token")
token, err := os.ReadFile("session.token")
if err == nil {
if conf.Account.Uin != 0 {
r := binary.NewReader(token)
@ -302,6 +265,7 @@ func main() {
text := readLineTimeout(time.Second*5, "1")
if text == "2" {
_ = os.Remove("session.token")
log.Infof("缓存已删除.")
os.Exit(0)
}
}
@ -310,11 +274,18 @@ func main() {
_ = os.Remove("session.token")
log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
time.Sleep(time.Second)
cli.Disconnect()
cli.Release()
cli = newClient()
} else {
isTokenLogin = true
}
}
}
if conf.Account.Uin != 0 && PasswordHash != [16]byte{} {
cli.Uin = conf.Account.Uin
cli.PasswordMd5 = PasswordHash
}
if !isTokenLogin {
if !isQRCodeLogin {
if err := commonLogin(); err != nil {
@ -339,6 +310,7 @@ func main() {
time.Sleep(time.Second * time.Duration(conf.Account.ReLogin.Delay))
for {
if conf.Account.ReLogin.Disabled {
log.Warnf("未启用自动重连, 将退出.")
os.Exit(1)
}
if times > conf.Account.ReLogin.MaxTimes && conf.Account.ReLogin.MaxTimes != 0 {
@ -351,6 +323,10 @@ func main() {
} else {
time.Sleep(time.Second)
}
if cli.Online {
log.Infof("登录已完成")
break
}
log.Warnf("尝试重连...")
err := cli.TokenLogin(AccountToken)
if err == nil {
@ -392,12 +368,12 @@ func main() {
} else {
coolq.SetMessageFormat(conf.Message.PostFormat)
}
log.Info("正在加载事件过滤器.")
coolq.IgnoreInvalidCQCode = conf.Message.IgnoreInvalidCQCode
coolq.SplitURL = conf.Message.FixURL
coolq.ForceFragmented = conf.Message.ForceFragment
coolq.RemoveReplyAt = conf.Message.RemoveReplyAt
coolq.ExtraReplyData = conf.Message.ExtraReplyData
coolq.SkipMimeScan = conf.Message.SkipMimeScan
for _, m := range conf.Servers {
if h, ok := m["http"]; ok {
hc := new(config.HTTPServer)
@ -431,13 +407,21 @@ func main() {
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)
}
}
}
log.Info("资源初始化完成, 开始处理信息.")
log.Info("アトリは、高性能ですから!")
c := make(chan os.Signal, 1)
go checkUpdate()
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
<-c
<-global.SetupMainSignalHandler()
}
// PasswordHashEncrypt 使用key加密给定passwordHash
@ -617,7 +601,7 @@ Options:
os.Exit(0)
}
func resetWorkDir() {
func resetWorkDir(wd string) {
args := make([]string, 0, len(os.Args))
for i := 1; i < len(os.Args); i++ {
if os.Args[i] == "-w" {
@ -626,7 +610,8 @@ func resetWorkDir() {
args = append(args, os.Args[i])
}
}
proc := exec.Command(os.Args[0], args...)
p, _ := filepath.Abs(os.Args[0])
proc := exec.Command(p, args...)
proc.Stdin = os.Stdin
proc.Stdout = os.Stdout
proc.Stderr = os.Stderr
@ -637,3 +622,34 @@ func resetWorkDir() {
}
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 {
c.SetCustomServer(addr)
}
log.Infof("读取到 %v 个自定义地址.", len(addr))
}
c.OnLog(func(c *client.QQClient, e *client.LogEvent) {
switch e.Type {
case "INFO":
log.Info("Protocol -> " + e.Message)
case "ERROR":
log.Error("Protocol -> " + e.Message)
case "DEBUG":
log.Debug("Protocol -> " + e.Message)
}
})
return c
}

6
scripts/bootstrap Normal file
View File

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

View File

@ -13,48 +13,56 @@ type resultGetter interface {
Get(string) gjson.Result
}
type handler func(action string, p resultGetter) coolq.MSG
type handler func(action string, p resultGetter) global.MSG
type apiCaller struct {
bot *coolq.CQBot
handlers []handler
}
func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getLoginInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetLoginInfo()
}
func getQiDianAccountInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getQiDianAccountInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetQiDianAccountInfo()
}
func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getFriendList(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetFriendList()
}
func deleteFriend(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQDeleteFriend(p.Get("id").Int())
func getUnidirectionalFriendList(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetUnidirectionalFriendList()
}
func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func deleteFriend(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQDeleteFriend(p.Get("[user_id,id].0").Int())
}
func deleteUnidirectionalFriend(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQDeleteUnidirectionalFriend(p.Get("user_id").Int())
}
func getGroupList(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupList(p.Get("no_cache").Bool())
}
func getGroupInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
}
func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupMemberList(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
}
func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupMemberInfo(
p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("no_cache").Bool(),
)
}
func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func sendMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
if p.Get("message_type").Str == "private" {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
@ -68,28 +76,28 @@ func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
if p.Get("group_id").Int() != 0 {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
}
return coolq.MSG{}
return global.MSG{}
}
func sendGroupMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func sendGroupMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
global.EnsureBool(p.Get("auto_escape"), false))
}
func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
}
func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"),
global.EnsureBool(p.Get("auto_escape"), false))
}
func deleteMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func deleteMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
}
func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) global.MSG {
apr := true
if p.Get("approve").Exists() {
apr = p.Get("approve").Bool()
@ -97,7 +105,7 @@ func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
}
func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) global.MSG {
subType := p.Get("sub_type").Str
apr := true
if subType == "" {
@ -109,19 +117,19 @@ func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
}
func setGroupCard(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupCard(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
}
func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
}
func setGroupKick(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupKick(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
}
func setGroupBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupBan(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
if p.Get("duration").Exists() {
return uint32(p.Get("duration").Int())
@ -130,7 +138,7 @@ func setGroupBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
}())
}
func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
if p.Get("enable").Exists() {
return p.Get("enable").Bool()
@ -139,11 +147,11 @@ func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
}())
}
func setGroupName(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupName(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
}
func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupAdmin(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
if p.Get("enable").Exists() {
return p.Get("enable").Bool()
@ -152,19 +160,19 @@ func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.MSG {
}())
}
func sendGroupNotice(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func sendGroupNotice(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str, p.Get("image").String())
}
func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupLeave(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupLeave(p.Get("group_id").Int())
}
func getImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getImage(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetImage(p.Get("file").Str)
}
func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getForwardMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
id := p.Get("message_id").Str
if id == "" {
id = p.Get("id").Str
@ -172,11 +180,11 @@ func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetForwardMessage(id)
}
func getMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetMessage(int32(p.Get("message_id").Int()))
}
func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func downloadFile(bot *coolq.CQBot, p resultGetter) global.MSG {
headers := map[string]string{}
headersToken := p.Get("headers")
if headersToken.IsArray() {
@ -199,11 +207,11 @@ func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
}
func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
}
func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.MSG {
func setRestart(_ *coolq.CQBot, _ resultGetter) global.MSG {
/*
var delay int64
delay = p.Get("delay").Int()
@ -215,115 +223,115 @@ func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.MSG {
Restart <- struct{}{}
}(delay)
*/
return coolq.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
return global.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
}
func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func canSendImage(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQCanSendImage()
}
func canSendRecord(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func canSendRecord(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQCanSendRecord()
}
func getStrangerInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getStrangerInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetStrangerInfo(p.Get("user_id").Int())
}
func getStatus(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getStatus(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetStatus()
}
func getVersionInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getVersionInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetVersionInfo()
}
func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) global.MSG {
return bot.CQGetGroupSystemMessages()
}
func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
}
func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
}
func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
}
func getGroupFileURL(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupFileURL(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
}
func uploadGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func uploadGroupFile(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
}
func groupFileCreateFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func groupFileCreateFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGroupFileCreateFolder(p.Get("group_id").Int(), p.Get("folder_id").Str, p.Get("name").Str)
}
func deleteGroupFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func deleteGroupFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGroupFileDeleteFolder(p.Get("group_id").Int(), p.Get("folder_id").Str)
}
func deleteGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("folder_id").Str, p.Get("file_id").Str, int32(p.Get("bus_id").Int()))
func deleteGroupFile(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("bus_id").Int()))
}
func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
}
func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getVipInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetVipInfo(p.Get("user_id").Int())
}
func reloadEventFilter(_ *coolq.CQBot, p resultGetter) coolq.MSG {
func reloadEventFilter(_ *coolq.CQBot, p resultGetter) global.MSG {
addFilter(p.Get("file").String())
return coolq.OK(nil)
}
func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetAtAllRemain(p.Get("group_id").Int())
}
func ocrImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func ocrImage(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQOcrImage(p.Get("image").Str)
}
func getOnlineClients(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getOnlineClients(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
}
func getWordSlices(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getWordSlices(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetWordSlices(p.Get("content").Str)
}
func setGroupPortrait(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupPortrait(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
}
func setEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setEssenceMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
}
func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
}
func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
}
func checkURLSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func checkURLSafely(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQCheckURLSafely(p.Get("url").String())
}
func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) global.MSG {
obj := p.Get("anonymous")
flag := p.Get("anonymous_flag")
if !flag.Exists() {
@ -338,84 +346,91 @@ func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
}
func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func handleQuickOperation(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
}
func getModelShow(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func getModelShow(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQGetModelShow(p.Get("model").String())
}
func setModelShow(bot *coolq.CQBot, p resultGetter) coolq.MSG {
func setModelShow(bot *coolq.CQBot, p resultGetter) global.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,
"get_group_member_info": getGroupMemberInfo,
"send_msg": sendMSG,
"send_group_msg": sendGroupMSG,
"send_group_forward_msg": sendGroupForwardMSG,
"send_private_msg": sendPrivateMSG,
"delete_msg": deleteMSG,
"set_friend_add_request": setFriendAddRequest,
"set_group_add_request": setGroupAddRequest,
"set_group_card": setGroupCard,
"set_group_special_title": setGroupSpecialTitle,
"set_group_kick": setGroupKick,
"set_group_ban": setGroupBan,
"set_group_whole_ban": setGroupWholeBan,
"set_group_name": setGroupName,
"set_group_admin": setGroupAdmin,
"_send_group_notice": sendGroupNotice,
"set_group_leave": setGroupLeave,
"get_image": getImage,
"get_forward_msg": getForwardMSG,
"get_msg": getMSG,
"download_file": downloadFile,
"get_group_honor_info": getGroupHonorInfo,
"set_restart": setRestart,
"can_send_image": canSendImage,
"can_send_record": canSendRecord,
"get_stranger_info": getStrangerInfo,
"get_status": getStatus,
"get_version_info": getVersionInfo,
"get_group_system_msg": getGroupSystemMSG,
"get_group_file_system_info": getGroupFileSystemInfo,
"get_group_root_files": getGroupRootFiles,
"get_group_files_by_folder": getGroupFilesByFolder,
"get_group_file_url": getGroupFileURL,
"create_group_file_folder": groupFileCreateFolder,
"delete_group_folder": deleteGroupFolder,
"delete_group_file": deleteGroupFile,
"upload_group_file": uploadGroupFile,
"get_group_msg_history": getGroupMsgHistory,
"_get_vip_info": getVipInfo,
"reload_event_filter": reloadEventFilter,
".ocr_image": ocrImage,
"ocr_image": ocrImage,
"get_group_at_all_remain": getGroupAtAllRemain,
"get_online_clients": getOnlineClients,
".get_word_slices": getWordSlices,
"set_group_portrait": setGroupPortrait,
"set_essence_msg": setEssenceMSG,
"delete_essence_msg": deleteEssenceMSG,
"get_essence_msg_list": getEssenceMsgList,
"check_url_safely": checkURLSafely,
"set_group_anonymous_ban": setGroupAnonymousBan,
".handle_quick_operation": handleQuickOperation,
"qidian_get_account_info": getQiDianAccountInfo,
"_get_model_show": getModelShow,
"_set_model_show": setModelShow,
func markMSGAsRead(bot *coolq.CQBot, p resultGetter) global.MSG {
return bot.CQMarkMessageAsRead(int32(p.Get("message_id").Int()))
}
func (api *apiCaller) callAPI(action string, p resultGetter) coolq.MSG {
// API 是go-cqhttp当前支持的所有api的映射表
var API = map[string]func(*coolq.CQBot, resultGetter) global.MSG{
"get_login_info": getLoginInfo,
"get_friend_list": getFriendList,
"get_unidirectional_friend_list": getUnidirectionalFriendList,
"delete_friend": deleteFriend,
"delete_unidirectional_friend": deleteUnidirectionalFriend,
"get_group_list": getGroupList,
"get_group_info": getGroupInfo,
"get_group_member_list": getGroupMemberList,
"get_group_member_info": getGroupMemberInfo,
"send_msg": sendMSG,
"send_group_msg": sendGroupMSG,
"send_group_forward_msg": sendGroupForwardMSG,
"send_private_msg": sendPrivateMSG,
"delete_msg": deleteMSG,
"set_friend_add_request": setFriendAddRequest,
"set_group_add_request": setGroupAddRequest,
"set_group_card": setGroupCard,
"set_group_special_title": setGroupSpecialTitle,
"set_group_kick": setGroupKick,
"set_group_ban": setGroupBan,
"set_group_whole_ban": setGroupWholeBan,
"set_group_name": setGroupName,
"set_group_admin": setGroupAdmin,
"_send_group_notice": sendGroupNotice,
"set_group_leave": setGroupLeave,
"get_image": getImage,
"get_forward_msg": getForwardMSG,
"get_msg": getMSG,
"download_file": downloadFile,
"get_group_honor_info": getGroupHonorInfo,
"set_restart": setRestart,
"can_send_image": canSendImage,
"can_send_record": canSendRecord,
"get_stranger_info": getStrangerInfo,
"get_status": getStatus,
"get_version_info": getVersionInfo,
"get_group_system_msg": getGroupSystemMSG,
"get_group_file_system_info": getGroupFileSystemInfo,
"get_group_root_files": getGroupRootFiles,
"get_group_files_by_folder": getGroupFilesByFolder,
"get_group_file_url": getGroupFileURL,
"create_group_file_folder": groupFileCreateFolder,
"delete_group_folder": deleteGroupFolder,
"delete_group_file": deleteGroupFile,
"upload_group_file": uploadGroupFile,
"get_group_msg_history": getGroupMsgHistory,
"_get_vip_info": getVipInfo,
"reload_event_filter": reloadEventFilter,
".ocr_image": ocrImage,
"ocr_image": ocrImage,
"get_group_at_all_remain": getGroupAtAllRemain,
"get_online_clients": getOnlineClients,
".get_word_slices": getWordSlices,
"set_group_portrait": setGroupPortrait,
"set_essence_msg": setEssenceMSG,
"delete_essence_msg": deleteEssenceMSG,
"get_essence_msg_list": getEssenceMsgList,
"check_url_safely": checkURLSafely,
"set_group_anonymous_ban": setGroupAnonymousBan,
".handle_quick_operation": handleQuickOperation,
"qidian_get_account_info": getQiDianAccountInfo,
"_get_model_show": getModelShow,
"_set_model_show": setModelShow,
"mark_msg_as_read": markMSGAsRead,
}
func (api *apiCaller) callAPI(action string, p resultGetter) global.MSG {
for _, fn := range api.handlers {
if ret := fn(action, p); ret != nil {
return ret

View File

@ -1,33 +1,33 @@
package server
import (
"bytes"
"context"
"crypto/hmac"
"crypto/sha1"
"encoding/hex"
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
"os"
"strings"
"time"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global/config"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/gin-gonic/gin"
"github.com/guonaihong/gout"
"github.com/guonaihong/gout/dataflow"
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 {
engine *gin.Engine
bot *coolq.CQBot
HTTP *http.Server
api *apiCaller
HTTP *http.Server
api *apiCaller
accessToken string
}
// HTTPClient 反向HTTP上报客户端
@ -36,11 +36,117 @@ type HTTPClient struct {
secret string
addr string
filter string
apiPort int
timeout int32
}
type httpContext struct {
ctx *gin.Context
type httpCtx struct {
json gjson.Result
query url.Values
postForm url.Values
}
func (h *httpCtx) Get(s string) gjson.Result {
j := h.json.Get(s)
if j.Exists() {
return j
}
validJSONParam := func(p string) bool {
return (strings.HasPrefix(p, "{") || strings.HasPrefix(p, "[")) && gjson.Valid(p)
}
if h.postForm != nil {
if form := h.postForm.Get(s); form != "" {
if validJSONParam(form) {
return gjson.Result{Type: gjson.JSON, Raw: form}
}
return gjson.Result{Type: gjson.String, Str: form}
}
}
if h.query != nil {
if query := h.query.Get(s); query != "" {
if validJSONParam(query) {
return gjson.Result{Type: gjson.JSON, Raw: query}
}
return gjson.Result{Type: gjson.String, Str: query}
}
}
return gjson.Result{}
}
func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
var ctx httpCtx
contentType := request.Header.Get("Content-Type")
switch request.Method {
case http.MethodPost:
if strings.Contains(contentType, "application/json") {
body, err := io.ReadAll(request.Body)
if err != nil {
log.Warnf("获取请求 %v 的Body时出现错误: %v", request.RequestURI, err)
writer.WriteHeader(http.StatusBadRequest)
return
}
if !gjson.ValidBytes(body) {
log.Warnf("已拒绝客户端 %v 的请求: 非法Json", request.RemoteAddr)
writer.WriteHeader(http.StatusBadRequest)
return
}
ctx.json = gjson.Parse(utils.B2S(body))
}
if strings.Contains(contentType, "application/x-www-form-urlencoded") {
err := request.ParseForm()
if err != nil {
log.Warnf("已拒绝客户端 %v 的请求: %v", request.RemoteAddr, err)
writer.WriteHeader(http.StatusBadRequest)
}
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, "/")
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上报客户端
@ -49,78 +155,27 @@ func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
return
}
var (
s = new(httpServer)
authToken = conf.AccessToken
addr string
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)
gin.SetMode(gin.ReleaseMode)
s.engine = gin.New()
s.bot = bot
s.api = newAPICaller(s.bot)
s.api = newAPICaller(bot)
if conf.RateLimit.Enabled {
s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
}
s.engine.Use(func(c *gin.Context) {
if c.Request.Method != "GET" && c.Request.Method != "POST" {
log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
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", c.Request.RequestURI, err)
c.Status(400)
return
}
if !gjson.ValidBytes(d) {
log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
c.Status(400)
return
}
c.Set("json_body", gjson.ParseBytes(d))
}
c.Next()
})
if authToken != "" {
s.engine.Use(func(c *gin.Context) {
auth := c.Request.Header.Get("Authorization")
if auth == "" {
headAuth := c.Query("access_token")
switch {
case headAuth == "":
c.AbortWithStatus(401)
return
case headAuth != authToken:
c.AbortWithStatus(403)
return
}
} else {
auth := strings.SplitN(auth, " ", 2)
switch {
case len(auth) != 2 || auth[1] == "":
c.AbortWithStatus(401)
return
case auth[1] != authToken:
c.AbortWithStatus(403)
return
}
}
})
if conf.LongPolling.Enabled {
s.api.use(longPolling(bot, conf.LongPolling.MaxQueueSize))
}
s.engine.Any("/:action", s.HandleActions)
go func() {
log.Infof("CQ HTTP 服务器已启动: %v", addr)
s.HTTP = &http.Server{
Addr: addr,
Handler: s.engine,
Handler: s,
}
if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Error(err)
@ -133,55 +188,55 @@ func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
client:
for _, c := range conf.Post {
if c.URL != "" {
go newHTTPClient().Run(c.URL, c.Secret, conf.Filter, conf.Timeout, bot)
go HTTPClient{
bot: bot,
secret: c.Secret,
addr: c.URL,
apiPort: conf.Port,
filter: conf.Filter,
timeout: conf.Timeout,
}.Run()
}
}
}
// newHTTPClient 返回反向HTTP客户端
func newHTTPClient() *HTTPClient {
return &HTTPClient{}
}
// Run 运行反向HTTP服务
func (c *HTTPClient) Run(addr, secret, filter string, timeout int32, bot *coolq.CQBot) {
c.bot = bot
c.secret = secret
c.addr = addr
c.timeout = timeout
c.filter = filter
addFilter(filter)
func (c HTTPClient) Run() {
addFilter(c.filter)
if c.timeout < 5 {
c.timeout = 5
}
bot.OnEventPush(c.onBotPushEvent)
log.Infof("HTTP POST上报器已启动: %v", addr)
c.bot.OnEventPush(c.onBotPushEvent)
log.Infof("HTTP POST上报器已启动: %v", c.addr)
}
func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
var res string
if c.filter != "" {
filter := findFilter(c.filter)
if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
log.Debugf("上报Event %v 到 HTTP 服务器 %v 时被过滤.", c.addr, utils.B2S(m.Bytes()))
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(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
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(m.Bytes())
_, err := mac.Write(e.JSONBytes())
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).
@ -193,43 +248,15 @@ func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
return nil
}).Do()
if err != nil {
log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
return
}
log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
if gjson.Valid(res) {
c.bot.CQHandleQuickOperation(gjson.Parse(utils.B2S(m.Bytes())), gjson.Parse(res))
c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.Parse(res))
}
}
func (s *httpServer) HandleActions(c *gin.Context) {
action := strings.TrimSuffix(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()

View File

@ -1,9 +1,12 @@
package server
import (
"container/list"
"context"
"os"
"sync"
"sync/atomic"
"time"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
@ -20,7 +23,7 @@ var (
func rateLimit(frequency float64, bucketSize int) handler {
limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
return func(_ string, _ resultGetter) coolq.MSG {
return func(_ string, _ resultGetter) global.MSG {
_ = limiter.Wait(context.Background())
return nil
}
@ -54,3 +57,57 @@ func findFilter(file string) global.Filter {
defer filterMutex.RUnlock()
return filters[file]
}
func longPolling(bot *coolq.CQBot, maxSize int) handler {
var mutex sync.Mutex
cond := sync.NewCond(&mutex)
queue := list.New()
bot.OnEventPush(func(event *coolq.Event) {
mutex.Lock()
defer mutex.Unlock()
queue.PushBack(event.RawMsg)
for maxSize != 0 && queue.Len() > maxSize {
queue.Remove(queue.Front())
}
cond.Signal()
})
return func(action string, p resultGetter) global.MSG {
if action != "get_updates" {
return nil
}
var (
ok int32
ch = make(chan []interface{}, 1)
timeout = time.Duration(p.Get("timeout").Int()) * time.Second
)
defer close(ch)
go func() {
mutex.Lock()
defer mutex.Unlock()
if queue.Len() == 0 {
cond.Wait()
}
if atomic.CompareAndSwapInt32(&ok, 0, 1) {
limit := int(p.Get("limit").Int())
if limit <= 0 || queue.Len() < limit {
limit = queue.Len()
}
ret := make([]interface{}, limit)
for i := 0; i < limit; i++ {
ret[i] = queue.Remove(queue.Front())
}
ch <- ret
}
}()
if timeout != 0 {
select {
case <-time.After(timeout):
atomic.StoreInt32(&ok, 1)
return coolq.OK([]interface{}{})
case ret := <-ch:
return coolq.OK(ret)
}
}
return coolq.OK(<-ch)
}
}

View File

@ -3,11 +3,10 @@ package server
import (
"fmt"
"net/http"
"net/http/pprof"
"os"
"time"
"github.com/gin-contrib/pprof"
"github.com/gin-gonic/gin"
log "github.com/sirupsen/logrus"
"github.com/Mrs4s/go-cqhttp/global/config"
@ -18,14 +17,18 @@ func RunPprofServer(conf *config.PprofServer) {
if conf.Disabled {
return
}
gin.SetMode(gin.ReleaseMode)
engine := gin.New()
addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
pprof.Register(engine)
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 := engine.Run(addr); err != nil && err != http.ErrServerClosed {
if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Error(err)
log.Infof("pprof 服务启动失败, 请检查端口是否被占用.")
log.Warnf("将在五秒后退出.")

182
server/scf.go Normal file
View File

@ -0,0 +1,182 @@
package server
import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
"os"
"runtime/debug"
"strings"
"github.com/Mrs4s/MiraiGo/utils"
log "github.com/sirupsen/logrus"
"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
buf bytes.Buffer
header http.Header
}
func (l *lambdaResponseWriter) Write(p []byte) (n int, err error) {
return l.buf.Write(p)
}
func (l *lambdaResponseWriter) Header() http.Header {
return l.header
}
func (l *lambdaResponseWriter) flush() error {
buffer := global.NewBuffer()
defer global.PutBuffer(buffer)
body := utils.B2S(l.buf.Bytes())
header := make(map[string]string)
for k, v := range l.header {
header[k] = v[0]
}
_ = json.NewEncoder(buffer).Encode(&lambdaResponse{
IsBase64Encoded: false,
StatusCode: l.statusCode,
Headers: header,
Body: body,
})
r, _ := http.NewRequest("POST", cli.responseURL, buffer)
do, err := cli.client.Do(r)
if err != nil {
return err
}
return do.Body.Close()
}
func (l *lambdaResponseWriter) WriteHeader(statusCode int) {
l.statusCode = statusCode
}
var cli *lambdaClient
// 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()
writer := lambdaResponseWriter{statusCode: 200, header: make(http.Header)}
func() {
defer func() {
if e := recover(); e != nil {
log.Warnf("Lambda 出现不可恢复错误: %v\n%s", e, debug.Stack())
}
}()
if req != nil {
server.ServeHTTP(&writer, req)
}
}()
if err := writer.flush(); err != nil {
log.Warnf("Lambda 发送响应失败: %v", err)
}
}
}
type lambdaInvoke struct {
Headers map[string]string
HTTPMethod string `json:"httpMethod"`
Body string `json:"body"`
Path string `json:"path"`
QueryString map[string]string
RequestContext struct {
Path string `json:"path"`
} `json:"requestContext"`
}
func (c *lambdaClient) next() *http.Request {
r, err := http.NewRequest(http.MethodGet, c.nextURL, nil)
if err != nil {
return nil
}
resp, err := c.client.Do(r)
if err != nil {
return nil
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return nil
}
req := new(http.Request)
invoke := new(lambdaInvoke)
_ = json.NewDecoder(resp.Body).Decode(invoke)
if invoke.HTTPMethod == "" { // 不是 api 网关
return nil
}
req.Method = invoke.HTTPMethod
req.Body = io.NopCloser(strings.NewReader(invoke.Body))
req.Header = make(map[string][]string)
for k, v := range invoke.Headers {
req.Header.Set(k, v)
}
req.URL = new(url.URL)
req.URL.Path = strings.TrimPrefix(invoke.Path, invoke.RequestContext.Path)
// todo: avoid encoding
query := make(url.Values)
for k, v := range invoke.QueryString {
query[k] = []string{v}
}
req.URL.RawQuery = query.Encode()
return req
}

View File

@ -31,8 +31,8 @@ type webSocketServer struct {
filter string
}
// WebSocketClient WebSocket客户端实例
type WebSocketClient struct {
// websocketClient WebSocket客户端实例
type websocketClient struct {
bot *coolq.CQBot
conf *config.WebsocketReverse
@ -59,22 +59,24 @@ func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
if conf.Disabled {
return
}
s := new(webSocketServer)
s.conf = conf
s.bot = b
s.token = conf.AccessToken
s.filter = conf.Filter
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())
b.OnEventPush(s.onBotPushEvent)
http.HandleFunc("/event", s.event)
http.HandleFunc("/api", s.api)
http.HandleFunc("/", s.any)
mux := http.ServeMux{}
mux.HandleFunc("/event", s.event)
mux.HandleFunc("/api", s.api)
mux.HandleFunc("/", s.any)
go func() {
log.Infof("CQ WebSocket 服务器已启动: %v", addr)
log.Fatal(http.ListenAndServe(addr, nil))
log.Fatal(http.ListenAndServe(addr, &mux))
}()
}
@ -83,11 +85,12 @@ func RunWebSocketClient(b *coolq.CQBot, conf *config.WebsocketReverse) {
if conf.Disabled {
return
}
c := new(WebSocketClient)
c.bot = b
c.conf = conf
c.token = conf.AccessToken
c.filter = conf.Filter
c := &websocketClient{
bot: b,
conf: conf,
token: conf.AccessToken,
filter: conf.Filter,
}
addFilter(c.filter)
if c.conf.Universal != "" {
c.connectUniversal()
@ -102,7 +105,7 @@ func RunWebSocketClient(b *coolq.CQBot, conf *config.WebsocketReverse) {
c.bot.OnEventPush(c.onBotPushEvent)
}
func (c *WebSocketClient) connectAPI() {
func (c *websocketClient) connectAPI() {
log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.API)
header := http.Header{
"X-Client-Role": []string{"API"},
@ -129,7 +132,7 @@ func (c *WebSocketClient) connectAPI() {
go c.listenAPI(wrappedConn, false)
}
func (c *WebSocketClient) connectEvent() {
func (c *websocketClient) connectEvent() {
log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.Event)
header := http.Header{
"X-Client-Role": []string{"Event"},
@ -157,10 +160,15 @@ func (c *WebSocketClient) connectEvent() {
}
log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
c.eventConn = &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
if c.eventConn == nil {
wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
c.eventConn = wrappedConn
} else {
c.eventConn.Conn = conn
}
}
func (c *WebSocketClient) connectUniversal() {
func (c *websocketClient) connectUniversal() {
log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.Universal)
header := http.Header{
"X-Client-Role": []string{"Universal"},
@ -186,15 +194,19 @@ func (c *WebSocketClient) connectUniversal() {
log.Warnf("反向WebSocket 握手时出现错误: %v", err)
}
wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
if c.conf.RateLimit.Enabled {
wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
if c.universalConn == nil {
wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
if c.conf.RateLimit.Enabled {
wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
}
c.universalConn = wrappedConn
} else {
c.universalConn.Conn = conn
}
go c.listenAPI(wrappedConn, true)
c.universalConn = wrappedConn
go c.listenAPI(c.universalConn, true)
}
func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
defer func() { _ = conn.Close() }()
for {
buffer := global.NewBuffer()
@ -225,66 +237,39 @@ func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
}
}
func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
filter := findFilter(c.filter)
if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
log.Debugf("上报Event %v 到 WS客户端 时被过滤.", utils.B2S(m.Bytes()))
if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
return
}
if c.eventConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
conn := c.eventConn
push := func(conn *webSocketConn, reconnect func()) {
log.Debugf("向WS服务器 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
conn.Lock()
defer conn.Unlock()
_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
_ = c.eventConn.Close()
_ = conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", conn.RemoteAddr().String(), err)
_ = conn.Close()
if c.conf.ReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
c.connectEvent()
reconnect()
}
}
}
if c.eventConn != nil {
push(c.eventConn, c.connectEvent)
}
if c.universalConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
conn := c.universalConn
conn.Lock()
defer conn.Unlock()
_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
_ = c.universalConn.Close()
if c.conf.ReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
c.connectUniversal()
}
}
push(c.universalConn, c.connectUniversal)
}
}
func (s *webSocketServer) auth(r *http.Request) (bool, int) {
if s.token != "" { // s.token == s.conf.AccessToken
var auth string
if auth = r.URL.Query().Get("access_token"); auth == "" {
headAuth := strings.SplitN(r.Header.Get("Authorization"), " ", 2)
if len(headAuth) != 2 || headAuth[1] == "" {
return false, 401
}
auth = headAuth[1]
}
if auth != s.token {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
return false, 403
}
}
return true, 0
}
func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
isAuth, errReason := s.auth(r)
if !isAuth {
w.WriteHeader(errReason)
status := checkAuth(r, s.token)
if status != http.StatusOK {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
w.WriteHeader(status)
return
}
c, err := upgrader.Upgrade(w, r, nil)
@ -309,9 +294,10 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
}
func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
isAuth, errReason := s.auth(r)
if !isAuth {
w.WriteHeader(errReason)
status := checkAuth(r, s.token)
if status != http.StatusOK {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
w.WriteHeader(status)
return
}
c, err := upgrader.Upgrade(w, r, nil)
@ -328,9 +314,10 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
}
func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
isAuth, errReason := s.auth(r)
if !isAuth {
w.WriteHeader(errReason)
status := checkAuth(r, s.token)
if status != http.StatusOK {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
w.WriteHeader(status)
return
}
c, err := upgrader.Upgrade(w, r, nil)
@ -398,33 +385,32 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
_ = c.WriteJSON(ret)
}
func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
s.eventConnMutex.Lock()
defer s.eventConnMutex.Unlock()
filter := findFilter(s.filter)
if filter != nil && !filter.Eval(gjson.Parse(utils.B2S(m.Bytes()))) {
log.Debugf("上报Event %v 到 WS客户端 时被过滤.", utils.B2S(m.Bytes()))
if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
log.Debugf("上报Event %s 到 WS客户端 时被过滤.", e.JSONBytes())
return
}
for i, l := 0, len(s.eventConn); i < l; i++ {
j := 0
for i := 0; i < len(s.eventConn); i++ {
conn := s.eventConn[i]
log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
log.Debugf("向WS客户端 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
conn.Lock()
if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); 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]
}