clean code

groupJoinReqEvent添加字段 invitor_id

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -11,7 +11,7 @@ body:
         ## 感谢您愿意填写错误回报！
         ## 以下是一些注意事项，请务必阅读让我们能够更容易处理
 
-        ### ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
+        ### ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://forums.go-cqhttp.org/t/topic/141)
         ### 🌎| 请准确填写环境信息
         ### ❔ | 打开DEBUG模式复现，并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
         ### ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
@@ -24,7 +24,7 @@ body:
     attributes:
       label: 请确保您已阅读以上注意事项，并勾选下方的确认框。
       options:
-        - label: "我已经仔细阅读上述教程和 [\"提问前需知\"](https://github.com/Mrs4s/go-cqhttp/issues/633)"
+        - label: "我已经仔细阅读上述教程和 [\"提问前需知\"](https://forums.go-cqhttp.org/t/topic/141)"
           required: true
         - label: "我已经使用 [dev分支版本](https://github.com/Mrs4s/go-cqhttp/actions/workflows/ci.yml) 测试过，问题依旧存在。"
           required: true

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:

.github/workflows/golint.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.19
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2

.github/workflows/release.yml

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

.gitignore

@@ -7,3 +7,11 @@ session.token
 device.json
 data/
 logs/
+internal/btree/*.lock
+internal/btree/*.db
+
+# binary builds
+go-cqhttp
+
+# macos
+.DS_Store

.golangci.yml

@@ -22,35 +22,24 @@ linters:
   fast: false
   enable:
     - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
+    - durationcheck
+    - gofmt
+    - goimports
     - errcheck
     - exportloopref
     - exhaustive
     - bidichk
-    #- funlen
-    #- goconst
     - gocritic
-    #- gocyclo
-    - gofmt
-    - goimports
-    - goprintffuncname
-    #- gosec
     - gosimple
     - govet
     - ineffassign
-    #- misspell
-    - nolintlint
-    - rowserrcheck
+    #- nolintlint
     - staticcheck
-    - structcheck
     - stylecheck
-    - typecheck
     - unconvert
+    - usestdlibvars
     - unparam
     - unused
-    - varcheck
     - whitespace
     - prealloc
     - predeclared

.goreleaser.yml

@@ -3,6 +3,9 @@ env:
 before:
   hooks:
     - go mod tidy
+release:
+  draft: true
+  discussion_category_name: General
 builds:
   - id: nowin
     env:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine AS builder
+FROM golang:1.19-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
@@ -14,11 +14,31 @@ RUN set -ex \
 
 FROM alpine:latest
 
-RUN apk add --no-cache ffmpeg
+COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-COPY --from=builder /build/cqhttp /usr/bin/cqhttp
-RUN chmod +x /usr/bin/cqhttp
+RUN chmod +x /docker-entrypoint.sh && \
+    apk add --no-cache --update \
+      ffmpeg \
+      coreutils \
+      shadow \
+      su-exec && \
+    rm -rf /var/cache/apk/* && \
+    mkdir -p /app && \
+    mkdir -p /data && \
+    mkdir -p /config && \
+    useradd -d /config -s /bin/sh abc && \
+    chown -R abc /config && \
+    chown -R abc /data
+
+ENV TZ="Asia/Shanghai"
+ENV UID=99
+ENV GID=100
+ENV UMASK=002
+
+COPY --from=builder /build/cqhttp /app/
 
 WORKDIR /data
 
-ENTRYPOINT [ "/usr/bin/cqhttp" ]
+VOLUME [ "/data" ]
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]

README.md

@@ -86,18 +86,18 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大
 | [CQ:xml]     | [XML 消息]                  |
 | [CQ:json]    | [JSON 消息]                 |
 
-[qq 表情]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#qq-%E8%A1%A8%E6%83%85
-[语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E8%AF%AD%E9%9F%B3
-[短视频]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
-[@某人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E6%9F%90%E4%BA%BA
-[链接分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
-[音乐分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
-[音乐自定义分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
-[回复]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%9B%9E%E5%A4%8D
-[合并转发]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
-[合并转发节点]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
-[xml 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#xml-%E6%B6%88%E6%81%AF
-[json 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#json-%E6%B6%88%E6%81%AF
+[qq 表情]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#qq-%E8%A1%A8%E6%83%85
+[语音]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E8%AF%AD%E9%9F%B3
+[短视频]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
+[@某人]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E6%9F%90%E4%BA%BA
+[链接分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
+[音乐分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
+[音乐自定义分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
+[回复]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%9B%9E%E5%A4%8D
+[合并转发]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
+[合并转发节点]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
+[xml 消息]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#xml-%E6%B6%88%E6%81%AF
+[json 消息]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#json-%E6%B6%88%E6%81%AF
 
 #### 拓展 CQ 码及与 OneBot 标准有略微差异的 CQ 码
 
@@ -154,33 +154,33 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大
 | /set_restart             | [重启 go-cqhttp]       |
 | /.handle_quick_operation | [对事件执行快速操作]   |
 
-[发送私聊消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
-[发送群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
-[发送消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
-[撤回信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
-[群组踢人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
-[群组单人禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
-[群组全员禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
-[群组设置管理员]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
-[设置群名片（群备注）]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
-[设置群名]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
-[退出群组]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
-[设置群组专属头衔]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
-[处理加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
-[处理加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
-[获取登录号信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
-[获取陌生人信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
-[获取好友列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
-[获取群信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
-[获取群列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
-[获取群成员信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
-[获取群成员列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
-[获取群荣誉信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
-[检查是否可以发送图片]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
-[检查是否可以发送语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
-[获取版本信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
-[重启 go-cqhttp]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
-[对事件执行快速操作]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
+[发送私聊消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[发送群消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
+[发送消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
+[撤回信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
+[群组踢人]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
+[群组单人禁言]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
+[群组全员禁言]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
+[群组设置管理员]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+[设置群名片（群备注）]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
+[设置群名]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
+[退出群组]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
+[设置群组专属头衔]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
+[处理加好友请求]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[处理加群请求/邀请]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+[获取登录号信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
+[获取陌生人信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
+[获取好友列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
+[获取群信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
+[获取群列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
+[获取群成员信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+[获取群成员列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
+[获取群荣誉信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+[检查是否可以发送图片]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
+[检查是否可以发送语音]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
+[获取版本信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
+[重启 go-cqhttp]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
+[对事件执行快速操作]: https://github.com/botuniverse/onebot-11/blob/master/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
 
@@ -239,21 +239,21 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大
 | 请求事件 | [加好友请求]     |
 | 请求事件 | [加群请求/邀请]  |
 
-[私聊信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
-[群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
-[群文件上传]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
-[群管理员变动]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
-[群成员减少]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
-[群成员增加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
-[群禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
-[好友添加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
-[群消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
-[好友消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
-[群内戳一戳]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
-[群红包运气王]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
-[群成员荣誉变更]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
-[加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
-[加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+[私聊信息]: https://github.com/botuniverse/onebot-11/blob/master/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[群消息]: https://github.com/botuniverse/onebot-11/blob/master/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
+[群文件上传]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
+[群管理员变动]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
+[群成员减少]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
+[群成员增加]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
+[群禁言]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
+[好友添加]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
+[群消息撤回]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[好友消息撤回]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[群内戳一戳]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
+[群红包运气王]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
+[群成员荣誉变更]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
+[加好友请求]: https://github.com/botuniverse/onebot-11/blob/master/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[加群请求/邀请]: https://github.com/botuniverse/onebot-11/blob/master/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
 
 #### 拓展 Event
 

cmd/gocq/login.go

@@ -3,17 +3,22 @@ package gocq
 import (
 	"bufio"
 	"bytes"
+	"fmt"
+	"image"
+	"image/png"
 	"os"
 	"strings"
 	"time"
 
-	qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
 	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/gocq/qrcode"
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
+	"gopkg.ilharper.com/x/isatty"
 
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 var console = bufio.NewReader(os.Stdin)
@@ -40,6 +45,14 @@ func readLineTimeout(t time.Duration, de string) (str string) {
 	return
 }
 
+func readIfTTY(de string) (str string) {
+	if isatty.Isatty(os.Stdin.Fd()) {
+		return readLine()
+	}
+	log.Warnf("未检测到输入终端，自动选择%s.", de)
+	return de
+}
+
 var cli *client.QQClient
 
 // ErrSMSRequestError SMS请求出错
@@ -53,12 +66,36 @@ func commonLogin() error {
 	return loginResponseProcessor(res)
 }
 
-func qrcodeLogin() error {
-	rsp, err := cli.FetchQRCode()
+func printQRCode(imgData []byte) {
+	const (
+		black = "\033[48;5;0m  \033[0m"
+		white = "\033[48;5;7m  \033[0m"
+	)
+	img, err := png.Decode(bytes.NewReader(imgData))
 	if err != nil {
-		return err
+		log.Panic(err)
 	}
-	fi, err := qrcode.Decode(bytes.NewReader(rsp.ImageData))
+	data := img.(*image.Gray).Pix
+	bound := img.Bounds().Max.X
+	buf := make([]byte, 0, (bound*4+1)*(bound))
+	i := 0
+	for y := 0; y < bound; y++ {
+		i = y * bound
+		for x := 0; x < bound; x++ {
+			if data[i] != 255 {
+				buf = append(buf, white...)
+			} else {
+				buf = append(buf, black...)
+			}
+			i++
+		}
+		buf = append(buf, '\n')
+	}
+	_, _ = colorable.NewColorableStdout().Write(buf)
+}
+
+func qrcodeLogin() error {
+	rsp, err := cli.FetchQRCodeCustomSize(1, 2, 1)
 	if err != nil {
 		return err
 	}
@@ -70,7 +107,7 @@ func qrcodeLogin() error {
 		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	}
 	time.Sleep(time.Second)
-	qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.QRCodeRecoveryLevels.Low).Get(fi.Content).Print()
+	printQRCode(rsp.ImageData)
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
 	if err != nil {
 		return err
@@ -117,7 +154,19 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		var text string
 		switch res.Error {
 		case client.SliderNeededError:
-			log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
+			log.Warnf("登录需要滑条验证码, 请选择验证方式: ")
+			log.Warnf("1. 使用浏览器抓取滑条并登录")
+			log.Warnf("2. 使用手机QQ扫码验证 (需要手Q和gocq在同一网络下).")
+			log.Warn("请输入(1 - 2)：")
+			text = readIfTTY("1")
+			if strings.Contains(text, "1") {
+				ticket := getTicket(res.VerifyUrl)
+				if ticket == "" {
+					os.Exit(0)
+				}
+				res, err = cli.SubmitTicket(ticket)
+				continue
+			}
 			cli.Disconnect()
 			cli.Release()
 			cli = client.NewClientEmpty()
@@ -145,8 +194,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
 			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
-			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
-			text = readLineTimeout(time.Second*10, "2")
+			log.Warn("请输入(1 - 2)：")
+			text = readIfTTY("2")
 			if strings.Contains(text, "1") {
 				if !cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
@@ -167,8 +216,7 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			msg := res.ErrorMessage
 			if strings.Contains(msg, "版本") {
 				msg = "密码错误或账号被冻结"
-			}
-			if strings.Contains(msg, "冻结") {
+			} else if strings.Contains(msg, "冻结") {
 				log.Fatalf("账号被冻结")
 			}
 			log.Warnf("登录失败: %v", msg)
@@ -178,3 +226,39 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		}
 	}
 }
+
+func getTicket(u string) (str string) {
+	id := utils.RandomString(8)
+	log.Warnf("请前往该地址验证 -> %v <- 或输入手动抓取的 ticket：（Enter 提交）", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
+	manual := make(chan string, 1)
+	go func() {
+		manual <- readLine()
+	}()
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+	for count := 120; count > 0; count-- {
+		select {
+		case <-ticker.C:
+			str = fetchCaptcha(id)
+			if str != "" {
+				return
+			}
+		case str = <-manual:
+			return
+		}
+	}
+	log.Warnf("验证超时")
+	return ""
+}
+
+func fetchCaptcha(id string) string {
+	g, err := download.Request{URL: "https://captcha.go-cqhttp.org/captcha/ticket?id=" + id}.JSON()
+	if err != nil {
+		log.Warnf("获取 Ticket 时出现错误: %v", err)
+		return ""
+	}
+	if g.Get("ticket").Exists() {
+		return g.Get("ticket").String()
+	}
+	return ""
+}

cmd/gocq/main.go

@@ -57,8 +57,12 @@ func Main() {
 		base.Help()
 	case base.LittleD:
 		server.Daemon()
-	case base.LittleWD != "":
-		base.ResetWorkingDir()
+	}
+	if base.LittleWD != "" {
+		err := os.Chdir(base.LittleWD)
+		if err != nil {
+			log.Fatalf("重置工作目录时出现错误: %v", err)
+		}
 	}
 	base.Init()
 
@@ -130,9 +134,7 @@ func Main() {
 	log.Info("当前版本:", base.Version)
 	if base.Debug {
 		log.SetLevel(log.DebugLevel)
-		log.SetReportCaller(true)
 		log.Warnf("已开启Debug模式.")
-		// log.Debugf("开发交流群: 192548878")
 	}
 	if !global.PathExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
@@ -221,8 +223,8 @@ func Main() {
 					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
 					log.Warnf("1. 使用会话缓存继续.")
 					log.Warnf("2. 删除会话缓存并重启.")
-					log.Warnf("请选择: (5秒后自动选1)")
-					text := readLineTimeout(time.Second*5, "1")
+					log.Warnf("请选择:")
+					text := readIfTTY("1")
 					if text == "2" {
 						_ = os.Remove("session.token")
 						log.Infof("缓存已删除.")
@@ -259,7 +261,7 @@ func Main() {
 	}
 	var times uint = 1 // 重试次数
 	var reLoginLock sync.Mutex
-	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
+	cli.DisconnectedEvent.Subscribe(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
 		times = 1
@@ -325,10 +327,9 @@ func Main() {
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 
-	go selfupdate.CheckUpdate()
 	go func() {
-		time.Sleep(5 * time.Second)
-		go selfdiagnosis.NetworkDiagnosis(cli)
+		selfupdate.CheckUpdate()
+		selfdiagnosis.NetworkDiagnosis(cli)
 	}()
 
 	<-global.SetupMainSignalHandler()
@@ -367,6 +368,7 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 
 func newClient() *client.QQClient {
 	c := client.NewClientEmpty()
+	c.UseFragmentMessage = base.ForceFragmented
 	c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
 		if !base.UseSSOAddress {
 			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
@@ -383,22 +385,36 @@ func newClient() *client.QQClient {
 		}
 		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)
-		case "DUMP":
+	c.SetLogger(protocolLogger{})
+	return c
+}
+
+type protocolLogger struct{}
+
+const fromProtocol = "Protocol -> "
+
+func (p protocolLogger) Info(format string, arg ...any) {
+	log.Infof(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Warning(format string, arg ...any) {
+	log.Warnf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Debug(format string, arg ...any) {
+	log.Debugf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Error(format string, arg ...any) {
+	log.Errorf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Dump(data []byte, format string, arg ...any) {
 	if !global.PathExists(global.DumpsPath) {
 		_ = os.MkdirAll(global.DumpsPath, 0o755)
 	}
 	dumpFile := path.Join(global.DumpsPath, fmt.Sprintf("%v.dump", time.Now().Unix()))
-			log.Errorf("出现错误 %v. 详细信息已转储至文件 %v 请连同日志提交给开发者处理", e.Message, dumpFile)
-			_ = os.WriteFile(dumpFile, e.Dump, 0o644)
-		}
-	})
-	return c
+	message := fmt.Sprintf(format, arg...)
+	log.Errorf("出现错误 %v. 详细信息已转储至文件 %v 请连同日志提交给开发者处理", message, dumpFile)
+	_ = os.WriteFile(dumpFile, data, 0o644)
 }

coolq/api.go

@@ -12,7 +12,6 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/segmentio/asm/base64"
@@ -28,6 +27,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 	"github.com/Mrs4s/go-cqhttp/internal/param"
 	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
@@ -39,7 +39,7 @@ type guildMemberPageToken struct {
 	nextQueryParam string
 }
 
-var defaultPageToken = &guildMemberPageToken{
+var defaultPageToken = guildMemberPageToken{
 	guildID:    0,
 	nextIndex:  0,
 	nextRoleID: 2,
@@ -151,13 +151,13 @@ func (bot *CQBot) CQGetGuildMembers(guildID uint64, nextToken string) global.MSG
 	if guild == nil {
 		return Failed(100, "GUILD_NOT_FOUND")
 	}
-	token := defaultPageToken
+	token := &defaultPageToken
 	if nextToken != "" {
 		i, exists := bot.nextTokenCache.Get(nextToken)
 		if !exists {
 			return Failed(100, "NEXT_TOKEN_NOT_EXISTS")
 		}
-		token = i.(*guildMemberPageToken)
+		token = i
 		if token.guildID != guildID {
 			return Failed(100, "GUILD_NOT_MATCH")
 		}
@@ -408,7 +408,6 @@ func (bot *CQBot) CQGetGroupList(noCache bool) global.MSG {
 		gs = append(gs, global.MSG{
 			"group_id":          g.Code,
 			"group_name":        g.Name,
-			"group_memo":        g.Memo,
 			"group_create_time": g.GroupCreateTime,
 			"group_level":       g.GroupLevel,
 			"max_member_count":  g.MaxMemberCount,
@@ -450,7 +449,6 @@ func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) global.MSG {
 		return OK(global.MSG{
 			"group_id":          group.Code,
 			"group_name":        group.Name,
-			"group_memo":        group.Memo,
 			"group_create_time": group.GroupCreateTime,
 			"group_level":       group.GroupLevel,
 			"max_member_count":  group.MaxMemberCount,
@@ -604,6 +602,30 @@ func (bot *CQBot) CQUploadGroupFile(groupID int64, file, name, folder string) gl
 	return OK(nil)
 }
 
+// CQUploadPrivateFile 扩展API-上传私聊文件
+//
+// @route(upload_private_file)
+func (bot *CQBot) CQUploadPrivateFile(userID int64, file, name string) global.MSG {
+	target := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  userID,
+	}
+	fileBody, err := os.Open(file)
+	if err != nil {
+		log.Warnf("上传私聊文件 %v 失败: %+v", file, err)
+		return Failed(100, "OPEN_FILE_ERROR", "打开文件失败")
+	}
+	localFile := &client.LocalFile{
+		FileName: name,
+		Body:     fileBody,
+	}
+	if err := bot.Client.UploadFile(target, localFile); err != nil {
+		log.Warnf("上传私聊 %v 文件 %v 失败: %+v", userID, file, err)
+		return Failed(100, "FILE_SYSTEM_UPLOAD_API_ERROR", err.Error())
+	}
+	return OK(nil)
+}
+
 // CQGroupFileCreateFolder 拓展API-创建群文件文件夹
 //
 // @route(create_group_file_folder)
@@ -687,6 +709,24 @@ func (bot *CQBot) CQSendMessage(groupID, userID int64, m gjson.Result, messageTy
 	return global.MSG{}
 }
 
+// CQSendForwardMessage 发送合并转发消息
+//
+// @route(send_forward_msg)
+// @rename(m->messages)
+func (bot *CQBot) CQSendForwardMessage(groupID, userID int64, m gjson.Result, messageType string) global.MSG {
+	switch {
+	case messageType == "group":
+		return bot.CQSendGroupForwardMessage(groupID, m)
+	case messageType == "private":
+		fallthrough
+	case userID != 0:
+		return bot.CQSendPrivateForwardMessage(userID, m)
+	case groupID != 0:
+		return bot.CQSendGroupForwardMessage(groupID, m)
+	}
+	return global.MSG{}
+}
+
 // CQSendGroupMessage 发送群消息
 //
 // https://git.io/Jtz1c
@@ -712,7 +752,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 
 	var elem []message.IMessageElement
 	if m.Type == gjson.JSON {
-		elem = bot.ConvertObjectMessage(m, MessageSourceGroup)
+		elem = bot.ConvertObjectMessage(m, message.SourceGroup)
 	} else {
 		str := m.String()
 		if str == "" {
@@ -722,13 +762,13 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 		if autoEscape {
 			elem = []message.IMessageElement{message.NewText(str)}
 		} else {
-			elem = bot.ConvertStringMessage(str, MessageSourceGroup)
+			elem = bot.ConvertStringMessage(str, message.SourceGroup)
 		}
 	}
 	fixAt(elem)
-	mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
-	if mid == -1 {
-		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+	mid, err := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
+	if err != nil {
+		return Failed(100, "SEND_MSG_API_ERROR", err.Error())
 	}
 	log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(m.String()), mid)
 	return OK(global.MSG{"message_id": mid})
@@ -766,7 +806,7 @@ func (bot *CQBot) CQSendGuildChannelMessage(guildID, channelID uint64, m gjson.R
 
 	var elem []message.IMessageElement
 	if m.Type == gjson.JSON {
-		elem = bot.ConvertObjectMessage(m, MessageSourceGuildChannel)
+		elem = bot.ConvertObjectMessage(m, message.SourceGuildChannel)
 	} else {
 		str := m.String()
 		if str == "" {
@@ -776,7 +816,7 @@ func (bot *CQBot) CQSendGuildChannelMessage(guildID, channelID uint64, m gjson.R
 		if autoEscape {
 			elem = []message.IMessageElement{message.NewText(str)}
 		} else {
-			elem = bot.ConvertStringMessage(str, MessageSourceGuildChannel)
+			elem = bot.ConvertStringMessage(str, message.SourceGuildChannel)
 		}
 	}
 	fixAt(elem)
@@ -788,25 +828,44 @@ func (bot *CQBot) CQSendGuildChannelMessage(guildID, channelID uint64, m gjson.R
 	return OK(global.MSG{"message_id": mid})
 }
 
-func (bot *CQBot) uploadForwardElement(m gjson.Result, groupID int64) *message.ForwardElement {
+func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType message.SourceType) *message.ForwardElement {
 	ts := time.Now().Add(-time.Minute * 5)
-	fm := message.NewForwardMessage()
+	groupID := target
+	source := message.Source{SourceType: sourceType, PrimaryID: target}
+	if sourceType == message.SourcePrivate {
+		// ios 设备的合并转发来源群号不能为 0
+		if len(bot.Client.GroupList) == 0 {
+			groupID = 1
+		} else {
+			groupID = bot.Client.GroupList[0].Uin
+		}
+	}
+	builder := bot.Client.NewForwardMessageBuilder(groupID)
 
-	var lazyUpload []func()
-	var wg sync.WaitGroup
+	var convertMessage func(m gjson.Result) *message.ForwardMessage
+	convertMessage = func(m gjson.Result) *message.ForwardMessage {
+		fm := message.NewForwardMessage()
+		var w worker
 		resolveElement := func(elems []message.IMessageElement) []message.IMessageElement {
 			for i, elem := range elems {
-			iescape := i
+				p := &elems[i]
 				switch o := elem.(type) {
-			case *LocalImageElement, *LocalVideoElement:
-				wg.Add(1)
-				lazyUpload = append(lazyUpload, func() {
-					defer wg.Done()
-					gm, err := bot.uploadMedia(o, groupID, true)
+				case *LocalVideoElement:
+					w.do(func() {
+						gm, err := bot.uploadLocalVideo(source, o)
 						if err != nil {
-						log.Warnf("警告: 群 %d %s上传失败: %v", groupID, o.Type().String(), err)
+							log.Warnf(uploadFailedTemplate, "合并转发", target, "视频", err)
 						} else {
-						elems[iescape] = gm
+							*p = gm
+						}
+					})
+				case *LocalImageElement:
+					w.do(func() {
+						gm, err := bot.uploadLocalImage(source, o)
+						if err != nil {
+							log.Warnf(uploadFailedTemplate, "合并转发", target, "图片", err)
+						} else {
+							*p = gm
 						}
 					})
 				}
@@ -818,22 +877,23 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, groupID int64) *message.F
 			if e.Get("type").Str != "node" {
 				return nil
 			}
-		ts.Add(time.Second)
 			if e.Get("data.id").Exists() {
 				i := e.Get("data.id").Int()
-			m, _ := db.GetGroupMessageByGlobalID(int32(i))
+				m, _ := db.GetMessageByGlobalID(int32(i))
 				if m != nil {
-				return &message.ForwardNode{
-					SenderId:   m.Attribute.SenderUin,
-					SenderName: m.Attribute.SenderName,
-					Time: func() int32 {
-						msgTime := m.Attribute.Timestamp
-						if msgTime == 0 {
-							return int32(ts.Unix())
+					mSource := message.SourcePrivate
+					if m.GetType() == "group" {
+						mSource = message.SourceGroup
 					}
-						return int32(msgTime)
-					}(),
-					Message: resolveElement(bot.ConvertContentMessage(m.Content, MessageSourceGroup)),
+					msgTime := m.GetAttribute().Timestamp
+					if msgTime == 0 {
+						msgTime = ts.Unix()
+					}
+					return &message.ForwardNode{
+						SenderId:   m.GetAttribute().SenderUin,
+						SenderName: m.GetAttribute().SenderName,
+						Time:       int32(msgTime),
+						Message:    resolveElement(bot.ConvertContentMessage(m.GetContent(), mSource)),
 					}
 				}
 				log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str)
@@ -844,7 +904,7 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, groupID int64) *message.F
 			if msgTime == 0 {
 				msgTime = ts.Unix()
 			}
-		name := e.Get("data.name").Str
+			name := e.Get("data.[name,nickname].0").Str
 			c := e.Get("data.content")
 			if c.IsArray() {
 				nested := false
@@ -856,16 +916,17 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, groupID int64) *message.F
 					return true
 				})
 				if nested { // 处理嵌套
-				fe := bot.uploadForwardElement(c, groupID)
+					nestedNode := builder.NestedNode()
+					builder.Link(nestedNode, convertMessage(c))
 					return &message.ForwardNode{
 						SenderId:   uin,
 						SenderName: name,
 						Time:       int32(msgTime),
-					Message:    []message.IMessageElement{fe},
+						Message:    []message.IMessageElement{nestedNode},
 					}
 				}
 			}
-		content := bot.ConvertObjectMessage(c, MessageSourceGroup)
+			content := bot.ConvertObjectMessage(c, sourceType)
 			if uin != 0 && name != "" && len(content) > 0 {
 				return &message.ForwardNode{
 					SenderId:   uin,
@@ -892,12 +953,10 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, groupID int64) *message.F
 			}
 		}
 
-	for _, upload := range lazyUpload {
-		go upload()
+		w.wait()
+		return fm
 	}
-	wg.Wait()
-
-	return bot.Client.UploadGroupForwardMessage(groupID, fm)
+	return builder.Main(convertMessage(m))
 }
 
 // CQSendGroupForwardMessage 扩展API-发送合并转发(群)
@@ -910,19 +969,47 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 		return Failed(100)
 	}
 
-	fe := bot.uploadForwardElement(m, groupID)
-	if fe != nil {
+	fe := bot.uploadForwardElement(m, groupID, message.SourceGroup)
+	if fe == nil {
+		return Failed(100, "EMPTY_NODES", "未找到任何可发送的合并转发信息")
+	}
 	ret := bot.Client.SendGroupForwardMessage(groupID, fe)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("合并转发(群)消息发送失败: 账号可能被风控.")
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
 	}
+	mid := bot.InsertGroupMessage(ret)
+	log.Infof("发送群 %v(%v)  的合并转发消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
 	return OK(global.MSG{
-			"message_id": bot.InsertGroupMessage(ret),
+		"message_id": mid,
+		"forward_id": fe.ResId,
 	})
 }
+
+// CQSendPrivateForwardMessage 扩展API-发送合并转发(好友)
+//
+// https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-%E7%BE%A4
+// @route(send_private_forward_msg)
+// @rename(m->messages)
+func (bot *CQBot) CQSendPrivateForwardMessage(userID int64, m gjson.Result) global.MSG {
+	if m.Type != gjson.JSON {
+		return Failed(100)
+	}
+	fe := bot.uploadForwardElement(m, userID, message.SourcePrivate)
+	if fe == nil {
 		return Failed(100, "EMPTY_NODES", "未找到任何可发送的合并转发信息")
 	}
+	mid := bot.SendPrivateMessage(userID, 0, &message.SendingMessage{Elements: []message.IMessageElement{fe}})
+	if mid == -1 {
+		log.Warnf("合并转发(好友)消息发送失败: 账号可能被风控.")
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+	}
+	log.Infof("发送好友 %v(%v)  的合并转发消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
+	return OK(global.MSG{
+		"message_id": mid,
+		"forward_id": fe.ResId,
+	})
+}
 
 // CQSendPrivateMessage 发送私聊消息
 //
@@ -932,7 +1019,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Result, autoEscape bool) global.MSG {
 	var elem []message.IMessageElement
 	if m.Type == gjson.JSON {
-		elem = bot.ConvertObjectMessage(m, MessageSourcePrivate)
+		elem = bot.ConvertObjectMessage(m, message.SourcePrivate)
 	} else {
 		str := m.String()
 		if str == "" {
@@ -941,7 +1028,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Resu
 		if autoEscape {
 			elem = []message.IMessageElement{message.NewText(str)}
 		} else {
-			elem = bot.ConvertStringMessage(str, MessageSourcePrivate)
+			elem = bot.ConvertStringMessage(str, message.SourcePrivate)
 		}
 	}
 	mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
@@ -994,6 +1081,17 @@ func (bot *CQBot) CQSetGroupName(groupID int64, name string) global.MSG {
 	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
+// CQGetGroupMemo 扩展API-获取群公告
+// @route(_get_group_notice)
+func (bot *CQBot) CQGetGroupMemo(groupID int64) global.MSG {
+	r, err := bot.Client.GetGroupNotice(groupID)
+	if err != nil {
+		return Failed(100, "获取群公告失败", err.Error())
+	}
+
+	return OK(r)
+}
+
 // CQSetGroupMemo 扩展API-发送群公告
 //
 // https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E7%BE%A4%E5%85%AC%E5%91%8A
@@ -1024,6 +1122,23 @@ func (bot *CQBot) CQSetGroupMemo(groupID int64, msg, img string) global.MSG {
 	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
+// CQDelGroupMemo 扩展API-删除群公告
+// @route(_del_group_notice)
+// @rename(fid->notice_id)
+func (bot *CQBot) CQDelGroupMemo(groupID int64, fid string) global.MSG {
+	if g := bot.Client.FindGroup(groupID); g != nil {
+		if g.SelfPermission() == client.Member {
+			return Failed(100, "PERMISSION_DENIED", "权限不足")
+		}
+		err := bot.Client.DelGroupNotice(groupID, fid)
+		if err != nil {
+			return Failed(100, "DELETE_NOTICE_ERROR", err.Error())
+		}
+		return OK(nil)
+	}
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+}
+
 // CQSetGroupKick 群组踢人
 //
 // https://git.io/Jtz1V
@@ -1114,9 +1229,9 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) global.MSG {
 		return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在")
 	}
 	if approve {
-		req.(*client.NewFriendRequest).Accept()
+		req.Accept()
 	} else {
-		req.(*client.NewFriendRequest).Reject()
+		req.Reject()
 	}
 	return OK(nil)
 }
@@ -1223,27 +1338,6 @@ func (bot *CQBot) CQSetGroupAdmin(groupID, userID int64, enable bool) global.MSG
 	return OK(nil)
 }
 
-// CQGetVipInfo 扩展API-获取VIP信息
-//
-// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96vip%E4%BF%A1%E6%81%AF
-// @route(_get_vip_info)
-func (bot *CQBot) CQGetVipInfo(userID int64) global.MSG {
-	vip, err := bot.Client.GetVipInfo(userID)
-	if err != nil {
-		return Failed(100, "VIP_API_ERROR", err.Error())
-	}
-	msg := global.MSG{
-		"user_id":          vip.Uin,
-		"nickname":         vip.Name,
-		"level":            vip.Level,
-		"level_speed":      vip.LevelSpeed,
-		"vip_level":        vip.VipLevel,
-		"vip_growth_speed": vip.VipGrowthSpeed,
-		"vip_growth_total": vip.VipGrowthTotal,
-	}
-	return OK(msg)
-}
-
 // CQGetGroupHonorInfo 获取群荣誉信息
 //
 // https://git.io/Jtz1H
@@ -1328,6 +1422,7 @@ func (bot *CQBot) CQGetStrangerInfo(userID int64) global.MSG {
 		"age":        info.Age,
 		"level":      info.Level,
 		"login_days": info.LoginDays,
+		"vip_level":  info.VipLevel,
 	})
 }
 
@@ -1347,7 +1442,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) global
 
 		if reply.Exists() {
 			autoEscape := param.EnsureBool(operation.Get("auto_escape"), false)
-			at := operation.Get("at_sender").Bool() && !isAnonymous && msgType == "group"
+			at := !isAnonymous && operation.Get("at_sender").Bool() && msgType == "group"
 			if at && reply.IsArray() {
 				// 在 reply 数组头部插入CQ码
 				replySegments := make([]global.MSG, 0)
@@ -1393,7 +1488,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) global
 			if operation.Get("delete").Bool() {
 				bot.CQDeleteMessage(int32(context.Get("message_id").Int()))
 			}
-			if operation.Get("kick").Bool() && !isAnonymous {
+			if !isAnonymous && operation.Get("kick").Bool() {
 				bot.CQSetGroupKick(context.Get("group_id").Int(), context.Get("user_id").Int(), "", operation.Get("reject_add_request").Bool())
 			}
 			if operation.Get("ban").Bool() {
@@ -1451,12 +1546,8 @@ func (bot *CQBot) CQGetImage(file string) global.MSG {
 		}
 		local := path.Join(global.CachePath, file+path.Ext(msg["filename"].(string)))
 		if !global.PathExists(local) {
-			if body, err := global.HTTPGetReadCloser(msg["url"].(string)); err == nil {
-				f, _ := os.OpenFile(local, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o0644)
-				_, _ = f.ReadFrom(body)
-				_ = body.Close()
-				_ = f.Close()
-			} else {
+			r := download.Request{URL: msg["url"].(string)}
+			if err := r.WriteToFile(local); err != nil {
 				log.Warnf("下载图片 %v 时出现错误: %v", msg["url"], err)
 				return Failed(100, "DOWNLOAD_IMAGE_ERROR", err.Error())
 			}
@@ -1475,18 +1566,18 @@ func (bot *CQBot) CQDownloadFile(url string, headers gjson.Result, threadCount i
 	h := map[string]string{}
 	if headers.IsArray() {
 		for _, sub := range headers.Array() {
-			str := strings.SplitN(sub.String(), "=", 2)
-			if len(str) == 2 {
-				h[str[0]] = str[1]
+			first, second, ok := strings.Cut(sub.String(), "=")
+			if ok {
+				h[first] = second
 			}
 		}
 	}
 	if headers.Type == gjson.String {
 		lines := strings.Split(headers.String(), "\r\n")
 		for _, sub := range lines {
-			str := strings.SplitN(sub, "=", 2)
-			if len(str) == 2 {
-				h[str[0]] = str[1]
+			first, second, ok := strings.Cut(sub, "=")
+			if ok {
+				h[first] = second
 			}
 		}
 	}
@@ -1499,7 +1590,8 @@ func (bot *CQBot) CQDownloadFile(url string, headers gjson.Result, threadCount i
 			return Failed(100, "DELETE_FILE_ERROR", err.Error())
 		}
 	}
-	if err := global.DownloadFileMultiThreading(url, file, 0, threadCount, h); err != nil {
+	r := download.Request{URL: url, Header: h}
+	if err := r.WriteToFileMultiThreading(file, threadCount); err != nil {
 		log.Warnf("下载链接 %v 时出现错误: %v", url, err)
 		return Failed(100, "DOWNLOAD_FILE_ERROR", err.Error())
 	}
@@ -1525,7 +1617,7 @@ func (bot *CQBot) CQGetForwardMessage(resID string) global.MSG {
 		r := make([]global.MSG, len(nodes))
 		for i, n := range nodes {
 			bot.checkMedia(n.Message, 0)
-			content := ToFormattedMessage(n.Message, MessageSource{SourceType: MessageSourceGroup}, false)
+			content := ToFormattedMessage(n.Message, message.Source{SourceType: message.SourceGroup})
 			if len(n.Message) == 1 {
 				if forward, ok := n.Message[0].(*message.ForwardMessage); ok {
 					content = transformNodes(forward.Nodes)
@@ -1538,6 +1630,7 @@ func (bot *CQBot) CQGetForwardMessage(resID string) global.MSG {
 				},
 				"time":     n.Time,
 				"content":  content,
+				"group_id": n.GroupId,
 			}
 		}
 		return r
@@ -1573,9 +1666,9 @@ func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
 	switch o := msg.(type) {
 	case *db.StoredGroupMessage:
 		m["group_id"] = o.GroupCode
-		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, MessageSourceGroup), MessageSource{SourceType: MessageSourceGroup, PrimaryID: uint64(o.GroupCode)}, false)
+		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourceGroup), message.Source{SourceType: message.SourceGroup, PrimaryID: o.GroupCode})
 	case *db.StoredPrivateMessage:
-		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, MessageSourcePrivate), MessageSource{SourceType: MessageSourcePrivate}, false)
+		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourcePrivate), message.Source{SourceType: message.SourcePrivate})
 	}
 	return OK(m)
 }
@@ -1584,28 +1677,28 @@ func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
 // @route(get_guild_msg)
 func (bot *CQBot) CQGetGuildMessage(messageID string, noCache bool) global.MSG {
 	source, seq := decodeGuildMessageID(messageID)
-	if source == nil {
+	if source.SourceType == 0 {
 		log.Warnf("获取消息时出现错误: 无效消息ID")
 		return Failed(100, "INVALID_MESSAGE_ID", "无效消息ID")
 	}
 	m := global.MSG{
 		"message_id": messageID,
 		"message_source": func() string {
-			if source.SourceType == MessageSourceGuildDirect {
+			if source.SourceType == message.SourceGuildDirect {
 				return "direct"
 			}
 			return "channel"
 		}(),
 		"message_seq": seq,
-		"guild_id":    fU64(source.PrimaryID),
+		"guild_id":    fU64(uint64(source.PrimaryID)),
 		"reactions":   []int{},
 	}
 	// nolint: exhaustive
 	switch source.SourceType {
-	case MessageSourceGuildChannel:
-		m["channel_id"] = fU64(source.SubID)
+	case message.SourceGuildChannel:
+		m["channel_id"] = fU64(uint64(source.SecondaryID))
 		if noCache {
-			pull, err := bot.Client.GuildService.PullGuildChannelMessage(source.PrimaryID, source.SubID, seq, seq)
+			pull, err := bot.Client.GuildService.PullGuildChannelMessage(uint64(source.PrimaryID), uint64(source.SecondaryID), seq, seq)
 			if err != nil {
 				log.Warnf("获取消息时出现错误: %v", err)
 				return Failed(100, "API_ERROR", err.Error())
@@ -1620,7 +1713,7 @@ func (bot *CQBot) CQGetGuildMessage(messageID string, noCache bool) global.MSG {
 				"tiny_id":  fU64(pull[0].Sender.TinyId),
 				"nickname": pull[0].Sender.Nickname,
 			}
-			m["message"] = ToFormattedMessage(pull[0].Elements, *source, false)
+			m["message"] = ToFormattedMessage(pull[0].Elements, source)
 			m["reactions"] = convertReactions(pull[0].Reactions)
 			bot.InsertGuildChannelMessage(pull[0])
 		} else {
@@ -1635,11 +1728,11 @@ func (bot *CQBot) CQGetGuildMessage(messageID string, noCache bool) global.MSG {
 				"tiny_id":  fU64(channelMsgByDB.Attribute.SenderTinyID),
 				"nickname": channelMsgByDB.Attribute.SenderName,
 			}
-			m["message"] = ToFormattedMessage(bot.ConvertContentMessage(channelMsgByDB.Content, MessageSourceGuildChannel), *source)
+			m["message"] = ToFormattedMessage(bot.ConvertContentMessage(channelMsgByDB.Content, message.SourceGuildChannel), source)
 		}
-	case MessageSourceGuildDirect:
+	case message.SourceGuildDirect:
 		// todo(mrs4s): 支持 direct 消息
-		m["tiny_id"] = fU64(source.SubID)
+		m["tiny_id"] = fU64(uint64(source.SecondaryID))
 	}
 	return OK(m)
 }
@@ -1678,12 +1771,12 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) global.MSG
 		log.Warnf("获取群历史消息失败: %v", err)
 		return Failed(100, "MESSAGES_API_ERROR", err.Error())
 	}
-	ms := make([]global.MSG, 0, len(msg))
+	ms := make([]*event, 0, len(msg))
 	for _, m := range msg {
 		bot.checkMedia(m.Elements, groupID)
 		id := bot.InsertGroupMessage(m)
 		t := bot.formatGroupMessage(m)
-		t["message_id"] = id
+		t.Others["message_id"] = id
 		ms = append(ms, t)
 	}
 	return OK(global.MSG{
@@ -1737,7 +1830,7 @@ func (bot *CQBot) CQCanSendRecord() global.MSG {
 // @route(ocr_image,".ocr_image")
 // @rename(image_id->image)
 func (bot *CQBot) CQOcrImage(imageID string) global.MSG {
-	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageID}, false, MessageSourceGroup)
+	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageID}, false, message.SourceGroup)
 	if err != nil {
 		log.Warnf("load image error: %v", err)
 		return Failed(100, "LOAD_FILE_ERROR", err.Error())
@@ -1777,12 +1870,10 @@ func (bot *CQBot) CQSetGroupAnonymousBan(groupID int64, flag string, duration in
 		return Failed(100, "INVALID_FLAG", "无效的flag")
 	}
 	if g := bot.Client.FindGroup(groupID); g != nil {
-		s := strings.SplitN(flag, "|", 2)
-		if len(s) != 2 {
+		id, nick, ok := strings.Cut(flag, "|")
+		if !ok {
 			return Failed(100, "INVALID_FLAG", "无效的flag")
 		}
-		id := s[0]
-		nick := s[1]
 		if err := g.MuteAnonymous(id, nick, duration); err != nil {
 			log.Warnf("anonymous ban error: %v", err)
 			return Failed(100, "CALL_API_ERROR", err.Error())
@@ -1899,22 +1990,7 @@ func (bot *CQBot) CQGetVersionInfo() global.MSG {
 		"runtime_version":            runtime.Version(),
 		"runtime_os":                 runtime.GOOS,
 		"version":                    base.Version,
-		"protocol": func() int {
-			switch client.SystemDeviceInfo.Protocol {
-			case client.Unset, client.IPad:
-				return 0
-			case client.AndroidPhone:
-				return 1
-			case client.AndroidWatch:
-				return 2
-			case client.MacOS:
-				return 3
-			case client.QiDian:
-				return 4
-			default:
-				return -1
-			}
-		}(),
+		"protocol_name":              client.SystemDeviceInfo.Protocol,
 	})
 }
 
@@ -1939,6 +2015,15 @@ func (bot *CQBot) CQGetModelShow(model string) global.MSG {
 	})
 }
 
+// CQSendGroupSign 群打卡
+//
+// https://club.vip.qq.com/onlinestatus/set
+// @route(send_group_sign)
+func (bot *CQBot) CQSendGroupSign(groupID int64) global.MSG {
+	bot.Client.SendGroupSign(groupID)
+	return OK(nil)
+}
+
 // CQSetModelShow 设置在线机型
 //
 // https://club.vip.qq.com/onlinestatus/set
@@ -1969,6 +2054,27 @@ func (bot *CQBot) CQMarkMessageAsRead(msgID int32) global.MSG {
 	return OK(nil)
 }
 
+// CQSetQQProfile 设置 QQ 资料
+//
+// @route(set_qq_profile)
+func (bot *CQBot) CQSetQQProfile(nickname, company, email, college, personalNote gjson.Result) global.MSG {
+	u := client.NewProfileDetailUpdate()
+
+	fi := func(f gjson.Result, do func(value string) client.ProfileDetailUpdate) {
+		if f.Exists() {
+			do(f.String())
+		}
+	}
+
+	fi(nickname, u.Nick)
+	fi(company, u.Company)
+	fi(email, u.Email)
+	fi(college, u.College)
+	fi(personalNote, u.PersonalNote)
+	bot.Client.UpdateProfile(u)
+	return OK(nil)
+}
+
 // CQReloadEventFilter 重载事件过滤器
 //
 // @route(reload_event_filter)
@@ -1984,8 +2090,7 @@ func OK(data interface{}) global.MSG {
 
 // Failed 生成失败返回值
 func Failed(code int, msg ...string) global.MSG {
-	m := ""
-	w := ""
+	m, w := "", ""
 	if len(msg) > 0 {
 		m = msg[0]
 	}

coolq/bot.go

@@ -5,10 +5,9 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io"
 	"os"
-	"path"
 	"runtime/debug"
+	"strings"
 	"sync"
 	"time"
 
@@ -16,6 +15,7 @@ import (
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/RomiChan/syncx"
 	"github.com/pkg/errors"
 	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
@@ -23,6 +23,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/mime"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -32,16 +33,15 @@ type CQBot struct {
 	lock   sync.RWMutex
 	events []func(*Event)
 
-	friendReqCache   sync.Map
-	tempSessionCache sync.Map
-	nextTokenCache   *utils.Cache
+	friendReqCache   syncx.Map[string, *client.NewFriendRequest]
+	tempSessionCache syncx.Map[int64, *client.TempSessionInfo]
+	nextTokenCache   *utils.Cache[*guildMemberPageToken]
 }
 
 // Event 事件
 type Event struct {
-	RawMsg global.MSG
-
 	once   sync.Once
+	Raw    *event
 	buffer *bytes.Buffer
 }
 
@@ -49,7 +49,7 @@ func (e *Event) marshal() {
 	if e.buffer == nil {
 		e.buffer = global.NewBuffer()
 	}
-	_ = json.NewEncoder(e.buffer).Encode(e.RawMsg)
+	_ = json.NewEncoder(e.buffer).Encode(e.Raw)
 }
 
 // JSONBytes return byes of json by lazy marshalling.
@@ -69,40 +69,40 @@ func (e *Event) JSONString() string {
 func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
 		Client:         cli,
-		nextTokenCache: utils.NewCache(time.Second * 10),
+		nextTokenCache: utils.NewCache[*guildMemberPageToken](time.Second * 10),
 	}
-	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
-	bot.Client.OnGroupMessage(bot.groupMessageEvent)
+	bot.Client.PrivateMessageEvent.Subscribe(bot.privateMessageEvent)
+	bot.Client.GroupMessageEvent.Subscribe(bot.groupMessageEvent)
 	if base.ReportSelfMessage {
-		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
-		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+		bot.Client.SelfPrivateMessageEvent.Subscribe(bot.privateMessageEvent)
+		bot.Client.SelfGroupMessageEvent.Subscribe(bot.groupMessageEvent)
 	}
-	bot.Client.OnTempMessage(bot.tempMessageEvent)
+	bot.Client.TempMessageEvent.Subscribe(bot.tempMessageEvent)
 	bot.Client.GuildService.OnGuildChannelMessage(bot.guildChannelMessageEvent)
 	bot.Client.GuildService.OnGuildMessageReactionsUpdated(bot.guildMessageReactionsUpdatedEvent)
 	bot.Client.GuildService.OnGuildMessageRecalled(bot.guildChannelMessageRecalledEvent)
 	bot.Client.GuildService.OnGuildChannelUpdated(bot.guildChannelUpdatedEvent)
 	bot.Client.GuildService.OnGuildChannelCreated(bot.guildChannelCreatedEvent)
 	bot.Client.GuildService.OnGuildChannelDestroyed(bot.guildChannelDestroyedEvent)
-	bot.Client.OnGroupMuted(bot.groupMutedEvent)
-	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
-	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
-	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)
-	bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
-	bot.Client.OnGroupMemberJoined(bot.memberJoinEvent)
-	bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent)
-	bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent)
-	bot.Client.OnGroupMemberCardUpdated(bot.memberCardUpdatedEvent)
-	bot.Client.OnNewFriendRequest(bot.friendRequestEvent)
-	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
-	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
-	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
-	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
-	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
+	bot.Client.GroupMuteEvent.Subscribe(bot.groupMutedEvent)
+	bot.Client.GroupMessageRecalledEvent.Subscribe(bot.groupRecallEvent)
+	bot.Client.GroupNotifyEvent.Subscribe(bot.groupNotifyEvent)
+	bot.Client.FriendNotifyEvent.Subscribe(bot.friendNotifyEvent)
+	bot.Client.MemberSpecialTitleUpdatedEvent.Subscribe(bot.memberTitleUpdatedEvent)
+	bot.Client.FriendMessageRecalledEvent.Subscribe(bot.friendRecallEvent)
+	bot.Client.OfflineFileEvent.Subscribe(bot.offlineFileEvent)
+	bot.Client.GroupJoinEvent.Subscribe(bot.joinGroupEvent)
+	bot.Client.GroupLeaveEvent.Subscribe(bot.leaveGroupEvent)
+	bot.Client.GroupMemberJoinEvent.Subscribe(bot.memberJoinEvent)
+	bot.Client.GroupMemberLeaveEvent.Subscribe(bot.memberLeaveEvent)
+	bot.Client.GroupMemberPermissionChangedEvent.Subscribe(bot.memberPermissionChangedEvent)
+	bot.Client.MemberCardUpdatedEvent.Subscribe(bot.memberCardUpdatedEvent)
+	bot.Client.NewFriendRequestEvent.Subscribe(bot.friendRequestEvent)
+	bot.Client.NewFriendEvent.Subscribe(bot.friendAddedEvent)
+	bot.Client.GroupInvitedEvent.Subscribe(bot.groupInvitedEvent)
+	bot.Client.UserWantJoinGroupEvent.Subscribe(bot.groupJoinReqEvent)
+	bot.Client.OtherClientStatusChangedEvent.Subscribe(bot.otherClientStatusChangedEvent)
+	bot.Client.GroupDigestEvent.Subscribe(bot.groupEssenceMsg)
 	go func() {
 		if base.HeartbeatInterval == 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
@@ -111,11 +111,7 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 		t := time.NewTicker(base.HeartbeatInterval)
 		for {
 			<-t.C
-			bot.dispatchEventMessage(global.MSG{
-				"time":            time.Now().Unix(),
-				"self_id":         bot.Client.Uin,
-				"post_type":       "meta_event",
-				"meta_event_type": "heartbeat",
+			bot.dispatchEvent("meta_event/heartbeat", global.MSG{
 				"status":   bot.CQGetStatus()["data"],
 				"interval": base.HeartbeatInterval.Milliseconds(),
 			})
@@ -131,8 +127,24 @@ func (bot *CQBot) OnEventPush(f func(e *Event)) {
 	bot.lock.Unlock()
 }
 
-// UploadLocalImageAsGroup 上传本地图片至群聊
-func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
+type worker struct {
+	wg sync.WaitGroup
+}
+
+func (w *worker) do(f func()) {
+	w.wg.Add(1)
+	go func() {
+		defer w.wg.Done()
+		f()
+	}()
+}
+
+func (w *worker) wait() {
+	w.wg.Wait()
+}
+
+// uploadLocalImage 上传本地图片
+func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement) (message.IMessageElement, error) {
 	if img.File != "" {
 		f, err := os.Open(img.File)
 		if err != nil {
@@ -141,106 +153,125 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 		defer func() { _ = f.Close() }()
 		img.Stream = f
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
+	if mt, ok := mime.CheckImage(img.Stream); !ok {
+		return nil, errors.New("image type error: " + mt)
 	}
-	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
-	if i != nil {
+	i, err := bot.Client.UploadImage(target, img.Stream, 4)
+	if err != nil {
+		return nil, err
+	}
+	switch i := i.(type) {
+	case *message.GroupImageElement:
 		i.Flash = img.Flash
 		i.EffectID = img.EffectID
+	case *message.FriendImageElement:
+		i.Flash = img.Flash
 	}
-	return
+	return i, err
 }
 
-// UploadLocalVideo 上传本地短视频至群聊
-func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
+// uploadLocalVideo 上传本地短视频至群聊
+func (bot *CQBot) uploadLocalVideo(target message.Source, v *LocalVideoElement) (*message.ShortVideoElement, error) {
 	video, err := os.Open(v.File)
 	if err != nil {
 		return nil, err
 	}
 	defer func() { _ = video.Close() }()
-	hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
-	cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
-	_, _ = video.Seek(0, io.SeekStart)
-	_, _ = v.thumb.Seek(0, io.SeekStart)
-	return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+	return bot.Client.UploadShortVideo(target, video, v.thumb, 4)
 }
 
-// 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")
+func removeLocalElement(elements []message.IMessageElement) []message.IMessageElement {
+	var j int
+	for i, e := range elements {
+		switch e.(type) {
+		case *LocalImageElement, *LocalVideoElement:
+		case *message.VoiceElement: // 未上传的语音消息， 也删除
+		case nil:
+		default:
+			if j < i {
+				elements[j] = e
 			}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
+			j++
 		}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
 	}
-	i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
-	if i != nil {
-		i.Flash = img.Flash
-	}
-	return
+	return elements[:j]
 }
 
-// UploadLocalImageAsGuildChannel 上传本地图片至频道
-func (bot *CQBot) UploadLocalImageAsGuildChannel(guildID, channelID uint64, img *LocalImageElement) (*message.GuildImageElement, error) {
-	if img.File != "" {
-		f, err := os.Open(img.File)
-		if err != nil {
-			return nil, errors.Wrap(err, "open image error")
-		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
-	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
-	}
-	return bot.Client.GuildService.UploadGuildImage(guildID, channelID, img.Stream)
+const uploadFailedTemplate = "警告: %s %d %s上传失败: %v"
+
+func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessageElement) []message.IMessageElement {
+	var w worker
+	var source string
+	switch target.SourceType { // nolint:exhaustive
+	case message.SourceGroup:
+		source = "群"
+	case message.SourcePrivate:
+		source = "私聊"
+	case message.SourceGuildChannel:
+		source = "频道"
 	}
 
-func (bot *CQBot) uploadGuildVideo(i *LocalVideoElement, guildID, channelID uint64) (*message.ShortVideoElement, error) {
-	video, err := os.Open(i.File)
+	for i, m := range elements {
+		p := &elements[i]
+		switch e := m.(type) {
+		case *LocalImageElement:
+			w.do(func() {
+				m, err := bot.uploadLocalImage(target, e)
 				if err != nil {
-		return nil, err
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "图片", err)
+				} else {
+					*p = m
 				}
-	defer func() { _ = video.Close() }()
-	_, _ = video.Seek(0, io.SeekStart)
-	_, _ = i.thumb.Seek(0, io.SeekStart)
-	n, err := bot.Client.UploadGuildShortVideo(guildID, channelID, video, i.thumb)
-	return n, err
+			})
+		case *message.VoiceElement:
+			w.do(func() {
+				m, err := bot.Client.UploadVoice(target, bytes.NewReader(e.Data))
+				if err != nil {
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "语音", err)
+				} else {
+					*p = m
+				}
+			})
+		case *LocalVideoElement:
+			w.do(func() {
+				m, err := bot.uploadLocalVideo(target, e)
+				if err != nil {
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "视频", err)
+				} else {
+					*p = m
+				}
+			})
+		}
+	}
+	w.wait()
+	return removeLocalElement(elements)
 }
 
 // SendGroupMessage 发送群消息
-func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
+func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (int32, error) {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  groupID,
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
 	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("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
-				continue
-			}
-			e = i
 		case *PokeElement:
 			if group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
 				}
 			}
-			return 0
+			return 0, nil
 		case *message.MusicShareElement:
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
-				return -1
+				return -1, errors.Wrap(err, "send group music share error")
 			}
-			return bot.InsertGroupMessage(ret)
+			return bot.InsertGroupMessage(ret), nil
 		case *message.AtElement:
 			if i.Target == 0 && group.SelfPermission() == client.Member {
 				e = message.NewText("@全体成员")
@@ -250,30 +281,28 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
-		return -1
+		return -1, errors.New("empty message")
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem, groupID)
-	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
+	ret := bot.Client.SendGroupMessage(groupID, m)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
-		return -1
+		return -1, errors.New("send group message failed: blocked by server")
 	}
-	return bot.InsertGroupMessage(ret)
+	return bot.InsertGroupMessage(ret), nil
 }
 
 // SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  target,
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
 	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("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
-				continue
-			}
-			e = i
 		case *PokeElement:
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
@@ -328,17 +357,19 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		default:
 			if session == nil && groupID != 0 {
 				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
+				//lint:ignore SA9003 there is a todo
 				if msg != nil { // nolint
 					// todo(Mrs4s)
 					// id = bot.InsertTempMessage(target, msg)
 				}
 				break
 			}
-			msg, err := session.(*client.TempSessionInfo).SendMessage(m)
+			msg, err := session.SendMessage(m)
 			if err != nil {
 				log.Errorf("发送临时会话消息失败: %v", err)
 				break
 			}
+			//lint:ignore SA9003 there is a todo
 			if msg != nil { // nolint
 				// todo(Mrs4s)
 				// id = bot.InsertTempMessage(target, msg)
@@ -362,29 +393,19 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 // SendGuildChannelMessage 发送频道消息
 func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.SendingMessage) string {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	source := message.Source{
+		SourceType:  message.SourceGuildChannel,
+		PrimaryID:   int64(guildID),
+		SecondaryID: int64(channelID),
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
 	for _, e := range m.Elements {
 		switch i := e.(type) {
-		case *LocalImageElement:
-			n, err := bot.UploadLocalImageAsGuildChannel(guildID, channelID, i)
-			if err != nil {
-				log.Warnf("警告: 频道 %d 消息%s上传失败: %v", channelID, e.Type().String(), err)
-				continue
-			}
-			e = n
-
-		case *LocalVideoElement:
-			n, err := bot.uploadGuildVideo(i, guildID, channelID)
-			if err != nil {
-				log.Warnf("警告: 频道 %d 消息%s上传失败: %v", channelID, e.Type().String(), err)
-				continue
-			}
-			e = n
-
 		case *message.MusicShareElement:
 			bot.Client.SendGuildMusicShare(guildID, channelID, i)
 			return "-1" // todo: fix this
 
-		case *LocalVoiceElement, *PokeElement:
+		case *message.VoiceElement, *PokeElement:
 			log.Warnf("警告: 频道暂不支持发送 %v 消息", i.Type().String())
 			continue
 		}
@@ -523,7 +544,7 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 
 // InsertGuildChannelMessage 频道消息入数据库
 func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) string {
-	id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, MessageSourceGuildChannel)
+	id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, message.SourceGuildChannel)
 	msg := &db.StoredGuildChannelMessage{
 		ID: id,
 		Attribute: &db.StoredGuildMessageAttribute{
@@ -544,24 +565,40 @@ func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) stri
 	return msg.ID
 }
 
-// Release 释放Bot实例
-func (bot *CQBot) Release() {
+func (bot *CQBot) event(typ string, others global.MSG) *event {
+	ev := new(event)
+	post, detail, ok := strings.Cut(typ, "/")
+	ev.PostType = post
+	ev.DetailType = detail
+	if ok {
+		detail, sub, _ := strings.Cut(detail, "/")
+		ev.DetailType = detail
+		ev.SubType = sub
+	}
+	ev.Time = time.Now().Unix()
+	ev.SelfID = bot.Client.Uin
+	ev.Others = others
+	return ev
 }
 
-func (bot *CQBot) dispatchEventMessage(m global.MSG) {
+func (bot *CQBot) dispatchEvent(typ string, others global.MSG) {
+	bot.dispatch(bot.event(typ, others))
+}
+
+func (bot *CQBot) dispatch(ev *event) {
 	bot.lock.RLock()
 	defer bot.lock.RUnlock()
 
-	event := &Event{RawMsg: m}
+	event := &Event{Raw: ev}
 	wg := sync.WaitGroup{}
 	wg.Add(len(bot.events))
 	for _, f := range bot.events {
 		go func(fn func(*Event)) {
 			defer func() {
-				wg.Done()
 				if pan := recover(); pan != nil {
-					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
+					log.Warnf("处理事件 %v 时出现错误: %v \n%s", event.JSONString(), pan, debug.Stack())
 				}
+				wg.Done()
 			}()
 
 			start := time.Now()
@@ -589,24 +626,6 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 
-func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group bool) (message.IMessageElement, error) {
-	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")
-}
-
 // encodeMessageID 临时先这样, 暂时用不上
 func encodeMessageID(target int64, seq int32) string {
 	return hex.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
@@ -618,7 +637,7 @@ func encodeMessageID(target int64, seq int32) string {
 // encodeGuildMessageID 将频道信息编码为字符串
 // 当信息来源为 Channel 时 primaryID 为 guildID , subID 为 channelID
 // 当信息来源为 Direct 时 primaryID 为 guildID , subID 为 tinyID
-func encodeGuildMessageID(primaryID, subID, seq uint64, source MessageSourceType) string {
+func encodeGuildMessageID(primaryID, subID, seq uint64, source message.SourceType) string {
 	return base64.StdEncoding.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
 		w.WriteByte(byte(source))
 		w.WriteUInt64(primaryID)
@@ -627,16 +646,16 @@ func encodeGuildMessageID(primaryID, subID, seq uint64, source MessageSourceType
 	}))
 }
 
-func decodeGuildMessageID(id string) (source *MessageSource, seq uint64) {
+func decodeGuildMessageID(id string) (source message.Source, seq uint64) {
 	b, _ := base64.StdEncoding.DecodeString(id)
 	if len(b) < 25 {
 		return
 	}
 	r := binary.NewReader(b)
-	source = &MessageSource{
-		SourceType: MessageSourceType(r.ReadByte()),
-		PrimaryID:  uint64(r.ReadInt64()),
-		SubID:      uint64(r.ReadInt64()),
+	source = message.Source{
+		SourceType:  message.SourceType(r.ReadByte()),
+		PrimaryID:   r.ReadInt64(),
+		SecondaryID: r.ReadInt64(),
 	}
 	seq = uint64(r.ReadInt64())
 	return

coolq/converter.go

@@ -2,6 +2,7 @@ package coolq
 
 import (
 	"strconv"
+	"strings"
 
 	"github.com/Mrs4s/MiraiGo/topic"
 
@@ -13,41 +14,35 @@ import (
 )
 
 func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {
+	sex := "unknown"
+	if m.Gender == 1 { // unknown = 0xff
+		sex = "female"
+	} else if m.Gender == 0 {
+		sex = "male"
+	}
+	role := "member"
+	switch m.Permission { // nolint:exhaustive
+	case client.Owner:
+		role = "owner"
+	case client.Administrator:
+		role = "admin"
+	}
 	return global.MSG{
 		"group_id":          groupID,
 		"user_id":           m.Uin,
 		"nickname":          m.Nickname,
 		"card":              m.CardName,
-		"sex": func() string {
-			if m.Gender == 1 {
-				return "female"
-			} else if m.Gender == 0 {
-				return "male"
-			}
-			// unknown = 0xff
-			return "unknown"
-		}(),
+		"sex":               sex,
 		"age":               0,
 		"area":              "",
 		"join_time":         m.JoinTime,
 		"last_sent_time":    m.LastSpeakTime,
 		"shut_up_timestamp": m.ShutUpTimestamp,
 		"level":             strconv.FormatInt(int64(m.Level), 10),
-		"role": func() string {
-			switch m.Permission {
-			case client.Owner:
-				return "owner"
-			case client.Administrator:
-				return "admin"
-			case client.Member:
-				return "member"
-			default:
-				return "member"
-			}
-		}(),
+		"role":              role,
 		"unfriendly":        false,
 		"title":             m.SpecialTitle,
-		"title_expire_time": m.SpecialTitleExpireTime,
+		"title_expire_time": 0,
 		"card_changeable":   false,
 	}
 }
@@ -65,27 +60,23 @@ func convertGuildMemberInfo(m []*client.GuildMemberInfo) (r []global.MSG) {
 	return
 }
 
-func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
-	source := MessageSource{
-		SourceType: MessageSourceGroup,
-		PrimaryID:  uint64(m.GroupCode),
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  m.GroupCode,
+	}
+	cqm := toStringMessage(m.Elements, source)
+	typ := "message/group/normal"
+	if m.Sender.Uin == bot.Client.Uin {
+		typ = "message_sent/group/normal"
 	}
-	cqm := ToStringMessage(m.Elements, source, true)
 	gm := global.MSG{
 		"anonymous":   nil,
 		"font":        0,
 		"group_id":    m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, source, false),
-		"message_type": "group",
+		"message":     ToFormattedMessage(m.Elements, source),
 		"message_seq": m.Id,
-		"post_type": func() string {
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
 		"raw_message": cqm,
-		"self_id":     bot.Client.Uin,
 		"sender": global.MSG{
 			"age":     0,
 			"area":    "",
@@ -93,8 +84,6 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
 			"sex":     "unknown",
 			"user_id": m.Sender.Uin,
 		},
-		"sub_type": "normal",
-		"time":     m.Time,
 		"user_id": m.Sender.Uin,
 	}
 	if m.Sender.IsAnonymous() {
@@ -122,21 +111,21 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
 			}
 		}
 		ms := gm["sender"].(global.MSG)
-		switch mem.Permission {
+		role := "member"
+		switch mem.Permission { // nolint:exhaustive
 		case client.Owner:
-			ms["role"] = "owner"
+			role = "owner"
 		case client.Administrator:
-			ms["role"] = "admin"
-		case client.Member:
-			ms["role"] = "member"
-		default:
-			ms["role"] = "member"
+			role = "admin"
 		}
+		ms["role"] = role
 		ms["nickname"] = mem.Nickname
 		ms["card"] = mem.CardName
 		ms["title"] = mem.SpecialTitle
 	}
-	return gm
+	ev := bot.event(typ, gm)
+	ev.Time = int64(m.Time)
+	return ev
 }
 
 func convertChannelInfo(c *client.ChannelInfo) global.MSG {
@@ -220,6 +209,15 @@ func convertReactions(reactions []*message.GuildMessageEmojiReaction) (r []globa
 	return
 }
 
+func toStringMessage(m []message.IMessageElement, source message.Source) string {
+	elems := toElements(m, source)
+	var sb strings.Builder
+	for _, elem := range elems {
+		elem.WriteCQCodeTo(&sb)
+	}
+	return sb.String()
+}
+
 func fU64(v uint64) string {
 	return strconv.FormatUint(v, 10)
 }

coolq/cqcode/element.go

@@ -0,0 +1,67 @@
+package cqcode
+
+import (
+	"bytes"
+	"strings"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+// Element single message
+type Element struct {
+	Type string
+	Data []Pair
+}
+
+// Pair key value pair
+type Pair struct {
+	K string
+	V string
+}
+
+// CQCode convert element to cqcode
+func (e *Element) CQCode() string {
+	buf := strings.Builder{}
+	e.WriteCQCodeTo(&buf)
+	return buf.String()
+}
+
+// WriteCQCodeTo write element's cqcode into sb
+func (e *Element) WriteCQCodeTo(sb *strings.Builder) {
+	if e.Type == "text" {
+		sb.WriteString(EscapeText(e.Data[0].V)) // must be {"text": value}
+		return
+	}
+	sb.WriteString("[CQ:")
+	sb.WriteString(e.Type)
+	for _, data := range e.Data {
+		sb.WriteByte(',')
+		sb.WriteString(data.K)
+		sb.WriteByte('=')
+		sb.WriteString(EscapeValue(data.V))
+	}
+	sb.WriteByte(']')
+}
+
+// MarshalJSON see encoding/json.Marshaler
+func (e *Element) MarshalJSON() ([]byte, error) {
+	return binary.NewWriterF(func(w *binary.Writer) {
+		buf := (*bytes.Buffer)(w)
+		// fmt.Fprintf(buf, `{"type":"%s","data":{`, e.Type)
+		buf.WriteString(`{"type":"`)
+		buf.WriteString(e.Type)
+		buf.WriteString(`","data":{`)
+		for i, data := range e.Data {
+			if i != 0 {
+				buf.WriteByte(',')
+			}
+			// fmt.Fprintf(buf, `"%s":%q`, data.K, data.V)
+			buf.WriteByte('"')
+			buf.WriteString(data.K)
+			buf.WriteString(`":`)
+			buf.WriteString(global.Quote(data.V))
+		}
+		buf.WriteString(`}}`)
+	}), nil
+}

coolq/cqcode/escape.go

@@ -0,0 +1,79 @@
+// Package cqcode provides CQCode util functions.
+package cqcode
+
+import "strings"
+
+// EscapeText 将字符串raw中部分字符转义
+//
+//   - & -> &
+//   - [ -> [
+//   - ] -> ]
+func EscapeText(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()
+}
+
+// EscapeValue 将字符串value中部分字符转义
+//
+//   - , -> &#44;
+//   - & -> &amp;
+//   - [ -> &#91;
+//   - ] -> &#93;
+func EscapeValue(value string) string {
+	ret := EscapeText(value)
+	return strings.ReplaceAll(ret, ",", "&#44;")
+}
+
+// UnescapeText 将字符串content中部分字符反转义
+//
+//   - &amp; -> &
+//   - &#91; -> [
+//   - &#93; -> ]
+func UnescapeText(content string) string {
+	ret := content
+	ret = strings.ReplaceAll(ret, "&#91;", "[")
+	ret = strings.ReplaceAll(ret, "&#93;", "]")
+	ret = strings.ReplaceAll(ret, "&amp;", "&")
+	return ret
+}
+
+// UnescapeValue 将字符串content中部分字符反转义
+//
+//   - &#44; -> ,
+//   - &amp; -> &
+//   - &#91; -> [
+//   - &#93; -> ]
+func UnescapeValue(content string) string {
+	ret := strings.ReplaceAll(content, "&#44;", ",")
+	return UnescapeText(ret)
+}

coolq/cqcode_test.go

@@ -5,15 +5,18 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/coolq/cqcode"
 )
 
 var bot = CQBot{}
 
 func TestCQBot_ConvertStringMessage(t *testing.T) {
-	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, MessageSourcePrivate) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, message.SourcePrivate) {
 		fmt.Println(v)
 	}
 }
@@ -25,14 +28,14 @@ var (
 
 func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertStringMessage(bench, MessageSourcePrivate)
+		bot.ConvertStringMessage(bench, message.SourcePrivate)
 	}
 	b.SetBytes(int64(len(bench)))
 }
 
 func BenchmarkCQBot_ConvertObjectMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertObjectMessage(benchArray, MessageSourcePrivate)
+		bot.ConvertObjectMessage(benchArray, message.SourcePrivate)
 	}
 }
 
@@ -41,7 +44,7 @@ const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&98765
 func BenchmarkCQCodeEscapeText(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		ret := bText
-		CQCodeEscapeText(ret)
+		cqcode.EscapeText(ret)
 	}
 }
 
@@ -61,6 +64,6 @@ func TestCQCodeEscapeText(t *testing.T) {
 		ret = strings.ReplaceAll(ret, "&", "&amp;")
 		ret = strings.ReplaceAll(ret, "[", "&#91;")
 		ret = strings.ReplaceAll(ret, "]", "&#93;")
-		assert.Equal(t, ret, CQCodeEscapeText(rs))
+		assert.Equal(t, ret, cqcode.EscapeText(rs))
 	}
 }

coolq/event.go

@@ -2,12 +2,11 @@ package coolq
 
 import (
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
-	"os"
 	"path"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
@@ -18,44 +17,81 @@ import (
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, source MessageSource, isRaw ...bool) (r interface{}) {
+func ToFormattedMessage(e []message.IMessageElement, source message.Source) (r interface{}) {
 	if base.PostFormat == "string" {
-		r = ToStringMessage(e, source, isRaw...)
+		r = toStringMessage(e, source)
 	} else if base.PostFormat == "array" {
-		r = ToArrayMessage(e, source)
+		r = toElements(e, source)
 	}
 	return
 }
 
-func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
-	bot.checkMedia(m.Elements, m.Sender.Uin)
-	source := MessageSource{
-		SourceType: MessageSourcePrivate,
-		PrimaryID:  uint64(m.Sender.Uin),
+type event struct {
+	PostType   string
+	DetailType string
+	SubType    string
+	Time       int64
+	SelfID     int64
+	Others     global.MSG
 }
-	cqm := ToStringMessage(m.Elements, source, true)
+
+func (ev *event) MarshalJSON() ([]byte, error) {
+	buf := global.NewBuffer()
+	defer global.PutBuffer(buf)
+
+	detail := ""
+	switch ev.PostType {
+	case "message", "message_sent":
+		detail = "message_type"
+	case "notice":
+		detail = "notice_type"
+	case "request":
+		detail = "request_type"
+	case "meta_event":
+		detail = "meta_event_type"
+	default:
+		panic("unknown post type: " + ev.PostType)
+	}
+	fmt.Fprintf(buf, `{"post_type":"%s","%s":"%s","time":%d,"self_id":%d`, ev.PostType, detail, ev.DetailType, ev.Time, ev.SelfID)
+	if ev.SubType != "" {
+		fmt.Fprintf(buf, `,"sub_type":"%s"`, ev.SubType)
+	}
+	for k, v := range ev.Others {
+		v, err := json.Marshal(v)
+		if err != nil {
+			log.Warnf("marshal message payload error: %v", err)
+			return nil, err
+		}
+		fmt.Fprintf(buf, `,"%s":%s`, k, v)
+	}
+	buf.WriteByte('}')
+	return append([]byte(nil), buf.Bytes()...), nil
+}
+
+func (bot *CQBot) privateMessageEvent(_ *client.QQClient, m *message.PrivateMessage) {
+	bot.checkMedia(m.Elements, m.Sender.Uin)
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  m.Sender.Uin,
+	}
+	cqm := toStringMessage(m.Elements, source)
 	id := bot.InsertPrivateMessage(m)
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
-	fm := global.MSG{
-		"post_type": func() string {
+	typ := "message/private/friend"
 	if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
+		typ = "message_sent/private/friend"
 	}
-			return "message"
-		}(),
-		"message_type": "private",
-		"sub_type":     "friend",
+	fm := global.MSG{
 		"message_id":  id,
 		"user_id":     m.Sender.Uin,
 		"target_id":   m.Target,
-		"message":      ToFormattedMessage(m.Elements, source, false),
+		"message":     ToFormattedMessage(m.Elements, source),
 		"raw_message": cqm,
 		"font":        0,
-		"self_id":      c.Uin,
-		"time":         time.Now().Unix(),
 		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"nickname": m.Sender.Nickname,
@@ -63,7 +99,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 			"age":      0,
 		},
 	}
-	bot.dispatchEventMessage(fm)
+	bot.dispatchEvent(typ, fm)
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
@@ -71,9 +107,7 @@ 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(global.MSG{
-				"post_type":   "notice",
-				"notice_type": "group_upload",
+			bot.dispatchEvent("notice/group_upload", global.MSG{
 				"group_id": m.GroupCode,
 				"user_id":  m.Sender.Uin,
 				"file": global.MSG{
@@ -83,35 +117,33 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 					"busid": file.Busid,
 					"url":   c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
 				},
-				"self_id": c.Uin,
-				"time":    time.Now().Unix(),
 			})
 			return
 		}
 	}
-	source := MessageSource{
-		SourceType: MessageSourceGroup,
-		PrimaryID:  uint64(m.GroupCode),
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  m.GroupCode,
 	}
-	cqm := ToStringMessage(m.Elements, source, true)
+	cqm := toStringMessage(m.Elements, source)
 	id := bot.InsertGroupMessage(m)
 	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	gm := bot.formatGroupMessage(m)
 	if gm == nil {
 		return
 	}
-	gm["message_id"] = id
-	bot.dispatchEventMessage(gm)
+	gm.Others["message_id"] = id
+	bot.dispatch(gm)
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
 	m := e.Message
 	bot.checkMedia(m.Elements, m.Sender.Uin)
-	source := MessageSource{
-		SourceType: MessageSourcePrivate,
-		PrimaryID:  uint64(e.Session.Sender),
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  e.Session.Sender,
 	}
-	cqm := ToStringMessage(m.Elements, source, true)
+	cqm := toStringMessage(m.Elements, source)
 	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
 	id := m.Id
 	// todo(Mrs4s)
@@ -120,17 +152,12 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 	// }
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := global.MSG{
-		"post_type":    "message",
-		"message_type": "private",
-		"sub_type":     "group",
 		"temp_source": e.Session.Source,
 		"message_id":  id,
 		"user_id":     m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, source, false),
+		"message":     ToFormattedMessage(m.Elements, source),
 		"raw_message": cqm,
 		"font":        0,
-		"self_id":      c.Uin,
-		"time":         time.Now().Unix(),
 		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"group_id": m.GroupCode,
@@ -139,7 +166,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 			"age":      0,
 		},
 	}
-	bot.dispatchEventMessage(tm)
+	bot.dispatchEvent("message/private/group", tm)
 }
 
 func (bot *CQBot) guildChannelMessageEvent(c *client.QQClient, m *message.GuildChannelMessage) {
@@ -149,31 +176,28 @@ func (bot *CQBot) guildChannelMessageEvent(c *client.QQClient, m *message.GuildC
 		return
 	}
 	channel := guild.FindChannel(m.ChannelId)
-	source := MessageSource{
-		SourceType: MessageSourceGuildChannel,
-		PrimaryID:  m.GuildId,
-		SubID:      m.ChannelId,
+	source := message.Source{
+		SourceType:  message.SourceGuildChannel,
+		PrimaryID:   int64(m.GuildId),
+		SecondaryID: int64(m.ChannelId),
 	}
-	log.Infof("收到来自频道 %v(%v) 子频道 %v(%v) 内 %v(%v) 的消息: %v", guild.GuildName, guild.GuildId, channel.ChannelName, m.ChannelId, m.Sender.Nickname, m.Sender.TinyId, ToStringMessage(m.Elements, source, true))
+	log.Infof("收到来自频道 %v(%v) 子频道 %v(%v) 内 %v(%v) 的消息: %v", guild.GuildName, guild.GuildId, channel.ChannelName, m.ChannelId, m.Sender.Nickname, m.Sender.TinyId, toStringMessage(m.Elements, source))
 	id := bot.InsertGuildChannelMessage(m)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "message",
-		"message_type": "guild",
-		"sub_type":     "channel",
+	ev := bot.event("message/guild/channel", global.MSG{
 		"guild_id":     fU64(m.GuildId),
 		"channel_id":   fU64(m.ChannelId),
 		"message_id":   id,
 		"user_id":      fU64(m.Sender.TinyId),
-		"message":      ToFormattedMessage(m.Elements, source, false), // todo: 增加对频道消息 Reply 的支持
-		"self_id":      bot.Client.Uin,
+		"message":      ToFormattedMessage(m.Elements, source), // todo: 增加对频道消息 Reply 的支持
 		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"time":         m.Time,
 		"sender": global.MSG{
 			"user_id":  m.Sender.TinyId,
 			"tiny_id":  fU64(m.Sender.TinyId),
 			"nickname": m.Sender.Nickname,
 		},
 	})
+	ev.Time = m.Time
+	bot.dispatch(ev)
 }
 
 func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *client.GuildMessageReactionsUpdatedEvent) {
@@ -181,7 +205,7 @@ func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *clien
 	if guild == nil {
 		return
 	}
-	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, MessageSourceGuildChannel)
+	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
 	str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, msgID)
 	currentReactions := make([]global.MSG, len(e.CurrentReactions))
 	for i, r := range e.CurrentReactions {
@@ -199,16 +223,12 @@ func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *clien
 		str += "无任何表情"
 	}
 	log.Infof(str)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":         "notice",
-		"notice_type":       "message_reactions_updated",
+	bot.dispatchEvent("notice/message_reactions_updated", global.MSG{
 		"guild_id":          fU64(e.GuildId),
 		"channel_id":        fU64(e.ChannelId),
 		"message_id":        msgID,
 		"operator_id":       fU64(e.OperatorId),
 		"current_reactions": currentReactions,
-		"time":              time.Now().Unix(),
-		"self_id":           bot.Client.Uin,
 		"self_tiny_id":      fU64(bot.Client.GuildService.TinyId),
 		"user_id":           e.OperatorId,
 	})
@@ -228,17 +248,13 @@ func (bot *CQBot) guildChannelMessageRecalledEvent(c *client.QQClient, e *client
 		log.Errorf("处理频道撤回事件时出现错误: 获取操作者资料时出现错误 %v", err)
 		return
 	}
-	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, MessageSourceGuildChannel)
+	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
 	log.Infof("用户 %v(%v) 撤回了频道 %v(%v) 子频道 %v(%v) 的消息 %v", operator.Nickname, operator.TinyId, guild.GuildName, guild.GuildId, channel.ChannelName, channel.ChannelId, msgID)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "notice",
-		"notice_type":  "guild_channel_recall",
+	bot.dispatchEvent("notice/guild_channel_recall", global.MSG{
 		"guild_id":     fU64(e.GuildId),
 		"channel_id":   fU64(e.ChannelId),
 		"operator_id":  fU64(e.OperatorId),
 		"message_id":   msgID,
-		"time":         time.Now().Unix(),
-		"self_id":      bot.Client.Uin,
 		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
 		"user_id":      e.OperatorId,
 	})
@@ -250,14 +266,10 @@ func (bot *CQBot) guildChannelUpdatedEvent(c *client.QQClient, e *client.GuildCh
 		return
 	}
 	log.Infof("频道 %v(%v) 子频道 %v(%v) 信息已更新", guild.GuildName, guild.GuildId, e.NewChannelInfo.ChannelName, e.NewChannelInfo.ChannelId)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "notice",
-		"notice_type":  "channel_updated",
+	bot.dispatchEvent("notice/channel_updated", global.MSG{
 		"guild_id":     fU64(e.GuildId),
 		"channel_id":   fU64(e.ChannelId),
 		"operator_id":  fU64(e.OperatorId),
-		"time":         time.Now().Unix(),
-		"self_id":      bot.Client.Uin,
 		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
 		"user_id":      e.OperatorId,
 		"old_info":     convertChannelInfo(e.OldChannelInfo),
@@ -275,16 +287,12 @@ func (bot *CQBot) guildChannelCreatedEvent(c *client.QQClient, e *client.GuildCh
 		member = &client.GuildUserProfile{Nickname: "未知"}
 	}
 	log.Infof("频道 %v(%v) 内用户 %v(%v) 创建了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "notice",
-		"notice_type":  "channel_created",
+	bot.dispatchEvent("notice/channel_created", global.MSG{
 		"guild_id":     fU64(e.GuildId),
 		"channel_id":   fU64(e.ChannelInfo.ChannelId),
 		"operator_id":  fU64(e.OperatorId),
-		"self_id":      bot.Client.Uin,
 		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
 		"user_id":      e.OperatorId,
-		"time":         time.Now().Unix(),
 		"channel_info": convertChannelInfo(e.ChannelInfo),
 	})
 }
@@ -299,16 +307,12 @@ func (bot *CQBot) guildChannelDestroyedEvent(c *client.QQClient, e *client.Guild
 		member = &client.GuildUserProfile{Nickname: "未知"}
 	}
 	log.Infof("频道 %v(%v) 内用户 %v(%v) 删除了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "notice",
-		"notice_type":  "channel_destroyed",
+	bot.dispatchEvent("notice/channel_destroyed", global.MSG{
 		"guild_id":     fU64(e.GuildId),
 		"channel_id":   fU64(e.ChannelInfo.ChannelId),
 		"operator_id":  fU64(e.OperatorId),
-		"self_id":      bot.Client.Uin,
 		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
 		"user_id":      e.OperatorId,
-		"time":         time.Now().Unix(),
 		"channel_info": convertChannelInfo(e.ChannelInfo),
 	})
 }
@@ -332,22 +336,15 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
 		}
 	}
-
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
+	typ := "notice/group_ban/ban"
+	if e.Time == 0 {
+		typ = "notice/group_ban/lift_ban"
+	}
+	bot.dispatchEvent(typ, global.MSG{
 		"duration":    e.Time,
 		"group_id":    e.GroupCode,
-		"notice_type": "group_ban",
 		"operator_id": e.OperatorUin,
-		"self_id":     c.Uin,
 		"user_id":     e.TargetUin,
-		"time":        time.Now().Unix(),
-		"sub_type": func() string {
-			if e.Time == 0 {
-				return "lift_ban"
-			}
-			return "ban"
-		}(),
 	})
 }
 
@@ -356,16 +353,15 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
 	gid := db.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(global.MSG{
-		"post_type":   "notice",
+
+	ev := bot.event("notice/group_recall", global.MSG{
 		"group_id":    e.GroupCode,
-		"notice_type": "group_recall",
-		"self_id":     c.Uin,
 		"user_id":     e.AuthorUin,
 		"operator_id": e.OperatorUin,
-		"time":        e.Time,
 		"message_id":  gid,
 	})
+	ev.Time = int64(e.Time)
+	bot.dispatch(ev)
 }
 
 func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
@@ -375,42 +371,27 @@ 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(global.MSG{
-			"post_type":   "notice",
+		bot.dispatchEvent("notice/notify/poke", global.MSG{
 			"group_id":  group.Code,
-			"notice_type": "notify",
-			"sub_type":    "poke",
-			"self_id":     c.Uin,
 			"user_id":   notify.Sender,
 			"sender_id": notify.Sender,
 			"target_id": notify.Receiver,
-			"time":        time.Now().Unix(),
 		})
 	case *client.GroupRedBagLuckyKingNotifyEvent:
 		sender := group.FindMember(notify.Sender)
 		luckyKing := group.FindMember(notify.LuckyKing)
 		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
+		bot.dispatchEvent("notice/notify/lucky_king", global.MSG{
 			"group_id":  group.Code,
-			"notice_type": "notify",
-			"sub_type":    "lucky_king",
-			"self_id":     c.Uin,
 			"user_id":   notify.Sender,
 			"sender_id": notify.Sender,
 			"target_id": notify.LuckyKing,
-			"time":        time.Now().Unix(),
 		})
 	case *client.MemberHonorChangedNotifyEvent:
 		log.Info(notify.Content())
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
+		bot.dispatchEvent("notice/notify/honor", global.MSG{
 			"group_id": group.Code,
-			"notice_type": "notify",
-			"sub_type":    "honor",
-			"self_id":     c.Uin,
 			"user_id":  notify.Uin,
-			"time":        time.Now().Unix(),
 			"honor_type": func() string {
 				switch notify.Honor {
 				case client.Talkative:
@@ -439,15 +420,10 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		} else {
 			log.Infof("好友 %v 戳了戳你.", friend.Nickname)
 		}
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
-			"notice_type": "notify",
-			"sub_type":    "poke",
-			"self_id":     c.Uin,
+		bot.dispatchEvent("notice/notify/poke", global.MSG{
 			"user_id":   notify.Sender,
 			"sender_id": notify.Sender,
 			"target_id": notify.Receiver,
-			"time":        time.Now().Unix(),
 		})
 	}
 }
@@ -456,14 +432,9 @@ func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSp
 	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",
+	bot.dispatchEvent("notice/notify/title", global.MSG{
 		"group_id": group.Code,
-		"self_id":     c.Uin,
 		"user_id":  e.Uin,
-		"time":        time.Now().Unix(),
 		"title":    e.NewTitle,
 	})
 }
@@ -476,14 +447,12 @@ func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageR
 	} else {
 		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "friend_recall",
-		"self_id":     c.Uin,
+	ev := bot.event("notice/friend_recall", global.MSG{
 		"user_id":    e.FriendUin,
-		"time":        e.Time,
 		"message_id": gid,
 	})
+	ev.Time = e.Time
+	bot.dispatch(ev)
 }
 
 func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
@@ -492,23 +461,19 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
 		return
 	}
 	log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "offline_file",
+	bot.dispatchEvent("notice/offline_file", global.MSG{
 		"user_id": e.Sender,
 		"file": global.MSG{
 			"name": e.FileName,
 			"size": e.FileSize,
 			"url":  e.DownloadUrl,
 		},
-		"self_id": c.Uin,
-		"time":    time.Now().Unix(),
 	})
 }
 
 func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
 	log.Infof("Bot进入了群 %v.", formatGroupName(group))
-	bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin))
+	bot.dispatch(bot.groupIncrease(group.Code, 0, c.Uin))
 }
 
 func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent) {
@@ -517,44 +482,33 @@ func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent)
 	} else {
 		log.Infof("Bot退出了群 %v.", formatGroupName(e.Group))
 	}
-	bot.dispatchEventMessage(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
 }
 
 func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.MemberPermissionChangedEvent) {
-	st := func() string {
+	st := "unset"
 	if e.NewPermission == client.Administrator {
-			return "set"
+		st = "set"
 	}
-		return "unset"
-	}()
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_admin",
-		"sub_type":    st,
+	bot.dispatchEvent("notice/group_admin/"+st, global.MSG{
 		"group_id": e.Group.Code,
 		"user_id":  e.Member.Uin,
-		"time":        time.Now().Unix(),
-		"self_id":     c.Uin,
 	})
 }
 
 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(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_card",
+	bot.dispatchEvent("notice/group_card", global.MSG{
 		"group_id": e.Group.Code,
 		"user_id":  e.Member.Uin,
 		"card_new": e.Member.CardName,
 		"card_old": e.OldCard,
-		"time":        time.Now().Unix(),
-		"self_id":     c.Uin,
 	})
 }
 
 func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
 	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
-	bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
+	bot.dispatch(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
 }
 
 func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
@@ -563,65 +517,49 @@ func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGrou
 	} else {
 		log.Infof("成员 %v 离开了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
 	}
-	bot.dispatchEventMessage(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
 }
 
 func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequest) {
 	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.friendReqCache.Store(flag, e)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "request",
-		"request_type": "friend",
+	bot.dispatchEvent("request/friend", global.MSG{
 		"user_id": e.RequesterUin,
 		"comment": e.Message,
 		"flag":    flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
 	})
 }
 
 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(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "friend_add",
-		"self_id":     c.Uin,
+	bot.dispatchEvent("notice/friend_add", global.MSG{
 		"user_id": e.Friend.Uin,
-		"time":        time.Now().Unix(),
 	})
 }
 
 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(global.MSG{
-		"post_type":    "request",
-		"request_type": "group",
-		"sub_type":     "invite",
+	bot.dispatchEvent("request/group/invite", global.MSG{
 		"group_id":   e.GroupCode,
 		"user_id":    e.InvitorUin,
+		"invitor_id": 0,
 		"comment":    "",
 		"flag":       flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
 	})
 }
 
 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(global.MSG{
-		"post_type":    "request",
-		"request_type": "group",
-		"sub_type":     "add",
+	bot.dispatchEvent("request/group/add", global.MSG{
 		"group_id":   e.GroupCode,
 		"user_id":    e.RequesterUin,
+		"invitor_id": e.ActionUin,
 		"comment":    e.Message,
 		"flag":       flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
 	})
 }
 
@@ -631,17 +569,13 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 	} else {
 		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "client_status",
+	bot.dispatchEvent("notice/client_status", global.MSG{
 		"online": e.Online,
 		"client": global.MSG{
 			"app_id":      e.Client.AppId,
 			"device_name": e.Client.DeviceName,
 			"device_kind": e.Client.DeviceKind,
 		},
-		"self_id": c.Uin,
-		"time":    time.Now().Unix(),
 	})
 }
 
@@ -668,61 +602,44 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	if e.OperatorUin == bot.Client.Uin {
 		return
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"group_id":    e.GroupCode,
-		"notice_type": "essence",
-		"sub_type": func() string {
+	subtype := "delete"
 	if e.OperationType == 1 {
-				return "add"
+		subtype = "add"
 	}
-			return "delete"
-		}(),
-		"self_id":     c.Uin,
+	bot.dispatchEvent("notice/essence/"+subtype, global.MSG{
+		"group_id":    e.GroupCode,
 		"sender_id":   e.SenderUin,
 		"operator_id": e.OperatorUin,
-		"time":        time.Now().Unix(),
 		"message_id":  gid,
 	})
 }
 
-func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
-	return global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_increase",
+func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) *event {
+	return bot.event("notice/group_increase/approve", global.MSG{
 		"group_id":    groupCode,
 		"operator_id": operatorUin,
-		"self_id":     bot.Client.Uin,
-		"sub_type":    "approve",
-		"time":        time.Now().Unix(),
 		"user_id":     userUin,
-	}
+	})
 }
 
-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,
-		"operator_id": func() int64 {
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) *event {
+	op := userUin
 	if operator != nil {
-				return operator.Uin
+		op = operator.Uin
 	}
-			return userUin
-		}(),
-		"self_id": bot.Client.Uin,
-		"sub_type": func() string {
+	subtype := "leave"
 	if operator != nil {
 		if userUin == bot.Client.Uin {
-					return "kick_me"
+			subtype = "kick_me"
+		} else {
+			subtype = "kick"
 		}
-				return "kick"
 	}
-			return "leave"
-		}(),
-		"time":    time.Now().Unix(),
+	return bot.event("notice/group_decrease/"+subtype, global.MSG{
+		"group_id":    groupCode,
+		"operator_id": op,
 		"user_id":     userUin,
-	}
+	})
 }
 
 func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
@@ -755,7 +672,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 			filename := hex.EncodeToString(i.Md5) + ".image"
 			cache.Image.Insert(i.Md5, data)
 			if i.Url != "" && !global.PathExists(path.Join(global.ImagePath, "guild-images", filename)) {
-				if err := global.DownloadFile(i.Url, path.Join(global.ImagePath, "guild-images", filename), -1, nil); err != nil {
+				r := download.Request{URL: i.Url}
+				if err := r.WriteToFile(path.Join(global.ImagePath, "guild-images", filename)); err != nil {
 					log.Warnf("下载频道图片时出现错误: %v", err)
 				}
 			}
@@ -773,12 +691,11 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
 			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
-				b, err := global.GetBytes(i.Url)
+				err := download.Request{URL: i.Url}.WriteToFile(path.Join(global.VoicePath, i.Name))
 				if err != nil {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
 			}
 		case *message.ShortVideoElement:
 			data := binary.NewWriterF(func(w *binary.Writer) {

db/database.go

@@ -40,61 +40,61 @@ type (
 
 	// StoredGroupMessage 持久化群消息
 	StoredGroupMessage struct {
-		ID          string                  `bson:"_id"`
-		GlobalID    int32                   `bson:"globalId"`
-		Attribute   *StoredMessageAttribute `bson:"attribute"`
-		SubType     string                  `bson:"subType"`
-		QuotedInfo  *QuotedInfo             `bson:"quotedInfo"`
-		GroupCode   int64                   `bson:"groupCode"`
-		AnonymousID string                  `bson:"anonymousId"`
-		Content     []global.MSG            `bson:"content"`
+		ID          string                  `bson:"_id" yaml:"-"`
+		GlobalID    int32                   `bson:"globalId" yaml:"-"`
+		Attribute   *StoredMessageAttribute `bson:"attribute" yaml:"-"`
+		SubType     string                  `bson:"subType" yaml:"-"`
+		QuotedInfo  *QuotedInfo             `bson:"quotedInfo" yaml:"-"`
+		GroupCode   int64                   `bson:"groupCode" yaml:"-"`
+		AnonymousID string                  `bson:"anonymousId" yaml:"-"`
+		Content     []global.MSG            `bson:"content" yaml:"content"`
 	}
 
 	// StoredPrivateMessage 持久化私聊消息
 	StoredPrivateMessage struct {
-		ID         string                  `bson:"_id"`
-		GlobalID   int32                   `bson:"globalId"`
-		Attribute  *StoredMessageAttribute `bson:"attribute"`
-		SubType    string                  `bson:"subType"`
-		QuotedInfo *QuotedInfo             `bson:"quotedInfo"`
-		SessionUin int64                   `bson:"sessionUin"`
-		TargetUin  int64                   `bson:"targetUin"`
-		Content    []global.MSG            `bson:"content"`
+		ID         string                  `bson:"_id" yaml:"-"`
+		GlobalID   int32                   `bson:"globalId" yaml:"-"`
+		Attribute  *StoredMessageAttribute `bson:"attribute" yaml:"-"`
+		SubType    string                  `bson:"subType" yaml:"-"`
+		QuotedInfo *QuotedInfo             `bson:"quotedInfo" yaml:"-"`
+		SessionUin int64                   `bson:"sessionUin" yaml:"-"`
+		TargetUin  int64                   `bson:"targetUin" yaml:"-"`
+		Content    []global.MSG            `bson:"content" yaml:"content"`
 	}
 
 	// StoredGuildChannelMessage 持久化频道消息
 	StoredGuildChannelMessage struct {
-		ID         string                       `bson:"_id"`
-		Attribute  *StoredGuildMessageAttribute `bson:"attribute"`
-		GuildID    uint64                       `bson:"guildId"`
-		ChannelID  uint64                       `bson:"channelId"`
-		QuotedInfo *QuotedInfo                  `bson:"quotedInfo"`
-		Content    []global.MSG                 `bson:"content"`
+		ID         string                       `bson:"_id" yaml:"-"`
+		Attribute  *StoredGuildMessageAttribute `bson:"attribute" yaml:"-"`
+		GuildID    uint64                       `bson:"guildId" yaml:"-"`
+		ChannelID  uint64                       `bson:"channelId" yaml:"-"`
+		QuotedInfo *QuotedInfo                  `bson:"quotedInfo" yaml:"-"`
+		Content    []global.MSG                 `bson:"content" yaml:"content"`
 	}
 
 	// StoredMessageAttribute 持久化消息属性
 	StoredMessageAttribute struct {
-		MessageSeq int32  `bson:"messageSeq"`
-		InternalID int32  `bson:"internalId"`
-		SenderUin  int64  `bson:"senderUin"`
-		SenderName string `bson:"senderName"`
-		Timestamp  int64  `bson:"timestamp"`
+		MessageSeq int32  `bson:"messageSeq" yaml:"-"`
+		InternalID int32  `bson:"internalId" yaml:"-"`
+		SenderUin  int64  `bson:"senderUin" yaml:"-"`
+		SenderName string `bson:"senderName" yaml:"-"`
+		Timestamp  int64  `bson:"timestamp" yaml:"-"`
 	}
 
 	// StoredGuildMessageAttribute 持久化频道消息属性
 	StoredGuildMessageAttribute struct {
-		MessageSeq   uint64 `bson:"messageSeq"`
-		InternalID   uint64 `bson:"internalId"`
-		SenderTinyID uint64 `bson:"senderTinyId"`
-		SenderName   string `bson:"senderName"`
-		Timestamp    int64  `bson:"timestamp"`
+		MessageSeq   uint64 `bson:"messageSeq" yaml:"-"`
+		InternalID   uint64 `bson:"internalId" yaml:"-"`
+		SenderTinyID uint64 `bson:"senderTinyId" yaml:"-"`
+		SenderName   string `bson:"senderName" yaml:"-"`
+		Timestamp    int64  `bson:"timestamp" yaml:"-"`
 	}
 
 	// QuotedInfo 引用回复
 	QuotedInfo struct {
-		PrevID        string       `bson:"prevId"`
-		PrevGlobalID  int32        `bson:"prevGlobalId"`
-		QuotedContent []global.MSG `bson:"quotedContent"`
+		PrevID        string       `bson:"prevId" yaml:"-"`
+		PrevGlobalID  int32        `bson:"prevGlobalId" yaml:"-"`
+		QuotedContent []global.MSG `bson:"quotedContent" yaml:"quoted_content"`
 	}
 )
 
@@ -104,21 +104,13 @@ func ToGlobalID(code int64, msgID int32) int32 {
 }
 
 func (m *StoredGroupMessage) GetID() string                         { return m.ID }
-
 func (m *StoredGroupMessage) GetType() string                       { return "group" }
-
 func (m *StoredGroupMessage) GetGlobalID() int32                    { return m.GlobalID }
-
 func (m *StoredGroupMessage) GetAttribute() *StoredMessageAttribute { return m.Attribute }
-
 func (m *StoredGroupMessage) GetContent() []global.MSG              { return m.Content }
 
 func (m *StoredPrivateMessage) GetID() string                         { return m.ID }
-
 func (m *StoredPrivateMessage) GetType() string                       { return "private" }
-
 func (m *StoredPrivateMessage) GetGlobalID() int32                    { return m.GlobalID }
-
 func (m *StoredPrivateMessage) GetAttribute() *StoredMessageAttribute { return m.Attribute }
-
 func (m *StoredPrivateMessage) GetContent() []global.MSG              { return m.Content }

db/leveldb/const.go

@@ -0,0 +1,25 @@
+package leveldb
+
+const dataVersion = 1
+
+const (
+	group        = 0x0
+	private      = 0x1
+	guildChannel = 0x2
+)
+
+type coder byte
+
+const (
+	coderNil coder = iota
+	coderInt
+	coderUint
+	coderInt32
+	coderUint32
+	coderInt64
+	coderUint64
+	coderString
+	coderMSG      // global.MSG
+	coderArrayMSG // []global.MSG
+	coderStruct   // struct{}
+)

db/leveldb/leveldb.go

@@ -1,56 +1,42 @@
 package leveldb
 
 import (
-	"bytes"
-	"encoding/gob"
 	"path"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-
 	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/pkg/errors"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 	"gopkg.in/yaml.v3"
 
 	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
-type LevelDBImpl struct {
+type database struct {
 	db *leveldb.DB
 }
 
-const (
-	group        byte = 0x0
-	private      byte = 0x1
-	guildChannel byte = 0x2
-)
+// config leveldb 相关配置
+type config struct {
+	Enable bool `yaml:"enable"`
+}
 
 func init() {
-	gob.Register(db.StoredMessageAttribute{})
-	gob.Register(db.StoredGuildMessageAttribute{})
-	gob.Register(db.QuotedInfo{})
-	gob.Register(global.MSG{})
-	gob.Register(db.StoredGroupMessage{})
-	gob.Register(db.StoredPrivateMessage{})
-	gob.Register(db.StoredGuildChannelMessage{})
-
 	db.Register("leveldb", func(node yaml.Node) db.Database {
-		conf := new(config.LevelDBConfig)
+		conf := new(config)
 		_ = node.Decode(conf)
 		if !conf.Enable {
 			return nil
 		}
-		return &LevelDBImpl{}
+		return &database{}
 	})
 }
 
-func (ldb *LevelDBImpl) Open() error {
-	p := path.Join("data", "leveldb-v2")
+func (ldb *database) Open() error {
+	p := path.Join("data", "leveldb-v3")
 	d, err := leveldb.OpenFile(p, &opt.Options{
-		WriteBuffer: 128 * opt.KiB,
+		WriteBuffer: 32 * opt.KiB,
 	})
 	if err != nil {
 		return errors.Wrap(err, "open leveldb error")
@@ -59,31 +45,31 @@ func (ldb *LevelDBImpl) Open() error {
 	return nil
 }
 
-func (ldb *LevelDBImpl) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
+func (ldb *database) GetMessageByGlobalID(id int32) (_ db.StoredMessage, err error) {
 	v, err := ldb.db.Get(binary.ToBytes(id), nil)
-	if err != nil {
+	if err != nil || len(v) == 0 {
 		return nil, errors.Wrap(err, "get value error")
 	}
-	r := binary.NewReader(v)
-	switch r.ReadByte() {
+	defer func() {
+		if r := recover(); r != nil {
+			err = errors.Errorf("%v", r)
+		}
+	}()
+	r, err := newReader(utils.B2S(v))
+	if err != nil {
+		return nil, err
+	}
+	switch r.uvarint() {
 	case group:
-		g := &db.StoredGroupMessage{}
-		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(g); err != nil {
-			return nil, errors.Wrap(err, "decode message error")
-		}
-		return g, nil
+		return r.readStoredGroupMessage(), nil
 	case private:
-		p := &db.StoredPrivateMessage{}
-		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(p); err != nil {
-			return nil, errors.Wrap(err, "decode message error")
-		}
-		return p, nil
+		return r.readStoredPrivateMessage(), nil
 	default:
 		return nil, errors.New("unknown message flag")
 	}
 }
 
-func (ldb *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+func (ldb *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
 	i, err := ldb.GetMessageByGlobalID(id)
 	if err != nil {
 		return nil, err
@@ -95,7 +81,7 @@ func (ldb *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMess
 	return g, nil
 }
 
-func (ldb *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+func (ldb *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
 	i, err := ldb.GetMessageByGlobalID(id)
 	if err != nil {
 		return nil, err
@@ -107,59 +93,48 @@ func (ldb *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivate
 	return p, nil
 }
 
-func (ldb *LevelDBImpl) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+func (ldb *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
 	v, err := ldb.db.Get([]byte(id), nil)
 	if err != nil {
 		return nil, errors.Wrap(err, "get value error")
 	}
-	r := binary.NewReader(v)
-	switch r.ReadByte() {
-	case guildChannel:
-		g := &db.StoredGuildChannelMessage{}
-		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(g); err != nil {
-			return nil, errors.Wrap(err, "decode message error")
+	defer func() {
+		if r := recover(); r != nil {
+			err = errors.Errorf("%v", r)
 		}
-		return g, nil
+	}()
+	r, err := newReader(utils.B2S(v))
+	if err != nil {
+		return nil, err
+	}
+	switch r.uvarint() {
+	case guildChannel:
+		return r.readStoredGuildChannelMessage(), nil
 	default:
 		return nil, errors.New("unknown message flag")
 	}
 }
 
-func (ldb *LevelDBImpl) InsertGroupMessage(msg *db.StoredGroupMessage) error {
-	buf := global.NewBuffer()
-	defer global.PutBuffer(buf)
-	if err := gob.NewEncoder(buf).Encode(msg); err != nil {
-		return errors.Wrap(err, "encode message error")
-	}
-	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(group)
-		w.Write(buf.Bytes())
-	}), nil)
+func (ldb *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+	w := newWriter()
+	w.uvarint(group)
+	w.writeStoredGroupMessage(msg)
+	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), w.bytes(), nil)
 	return errors.Wrap(err, "put data error")
 }
 
-func (ldb *LevelDBImpl) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
-	buf := global.NewBuffer()
-	defer global.PutBuffer(buf)
-	if err := gob.NewEncoder(buf).Encode(msg); err != nil {
-		return errors.Wrap(err, "encode message error")
-	}
-	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(private)
-		w.Write(buf.Bytes())
-	}), nil)
+func (ldb *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+	w := newWriter()
+	w.uvarint(private)
+	w.writeStoredPrivateMessage(msg)
+	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), w.bytes(), nil)
 	return errors.Wrap(err, "put data error")
 }
 
-func (ldb *LevelDBImpl) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
-	buf := global.NewBuffer()
-	defer global.PutBuffer(buf)
-	if err := gob.NewEncoder(buf).Encode(msg); err != nil {
-		return errors.Wrap(err, "encode message error")
-	}
-	err := ldb.db.Put(utils.S2B(msg.ID), binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(guildChannel)
-		w.Write(buf.Bytes())
-	}), nil)
+func (ldb *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+	w := newWriter()
+	w.uvarint(guildChannel)
+	w.writeStoredGuildChannelMessage(msg)
+	err := ldb.db.Put(utils.S2B(msg.ID), w.bytes(), nil)
 	return errors.Wrap(err, "put data error")
 }

db/leveldb/reader.go

@@ -0,0 +1,131 @@
+package leveldb
+
+import (
+	"encoding/binary"
+	"io"
+	"strconv"
+	"strings"
+
+	"github.com/pkg/errors"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type intReader struct {
+	data string
+	*strings.Reader
+}
+
+func newIntReader(s string) intReader {
+	return intReader{
+		data:   s,
+		Reader: strings.NewReader(s),
+	}
+}
+
+func (r *intReader) varint() int64 {
+	i, _ := binary.ReadVarint(r)
+	return i
+}
+
+func (r *intReader) uvarint() uint64 {
+	i, _ := binary.ReadUvarint(r)
+	return i
+}
+
+// reader implements the index read.
+// data format is the same as the writer's
+type reader struct {
+	data        intReader
+	strings     intReader
+	stringIndex map[uint64]string
+}
+
+func (r *reader) coder() coder    { o, _ := r.data.ReadByte(); return coder(o) }
+func (r *reader) varint() int64   { return r.data.varint() }
+func (r *reader) uvarint() uint64 { return r.data.uvarint() }
+func (r *reader) int32() int32    { return int32(r.varint()) }
+func (r *reader) int64() int64    { return r.varint() }
+func (r *reader) uint64() uint64  { return r.uvarint() }
+
+// func (r *reader) uint32() uint32 { return uint32(r.uvarint()) }
+// func (r *reader) int() int        { return int(r.varint()) }
+// func (r *reader) uint() uint      { return uint(r.uvarint()) }
+
+func (r *reader) string() string {
+	off := r.data.uvarint()
+	if s, ok := r.stringIndex[off]; ok {
+		return s
+	}
+	_, _ = r.strings.Seek(int64(off), io.SeekStart)
+	l := int64(r.strings.uvarint())
+	whence, _ := r.strings.Seek(0, io.SeekCurrent)
+	s := r.strings.data[whence : whence+l]
+	r.stringIndex[off] = s
+	return s
+}
+
+func (r *reader) msg() global.MSG {
+	length := r.uvarint()
+	msg := make(global.MSG, length)
+	for i := uint64(0); i < length; i++ {
+		s := r.string()
+		msg[s] = r.obj()
+	}
+	return msg
+}
+
+func (r *reader) arrayMsg() []global.MSG {
+	length := r.uvarint()
+	msgs := make([]global.MSG, length)
+	for i := range msgs {
+		msgs[i] = r.msg()
+	}
+	return msgs
+}
+
+func (r *reader) obj() interface{} {
+	switch coder := r.coder(); coder {
+	case coderNil:
+		return nil
+	case coderInt:
+		return int(r.varint())
+	case coderUint:
+		return uint(r.uvarint())
+	case coderInt32:
+		return int32(r.varint())
+	case coderUint32:
+		return uint32(r.uvarint())
+	case coderInt64:
+		return r.varint()
+	case coderUint64:
+		return r.uvarint()
+	case coderString:
+		return r.string()
+	case coderMSG:
+		return r.msg()
+	case coderArrayMSG:
+		return r.arrayMsg()
+	default:
+		panic("db/leveldb: invalid coder " + strconv.Itoa(int(coder)))
+	}
+}
+
+func newReader(data string) (*reader, error) {
+	in := newIntReader(data)
+	v := in.uvarint()
+	if v != dataVersion {
+		return nil, errors.Errorf("db/leveldb: invalid data version %d", v)
+	}
+	sl := int64(in.uvarint())
+	dl := int64(in.uvarint())
+	whence, _ := in.Seek(0, io.SeekCurrent)
+	sData := data[whence : whence+sl]
+	dData := data[whence+sl : whence+sl+dl]
+	r := reader{
+		data:        newIntReader(dData),
+		strings:     newIntReader(sData),
+		stringIndex: make(map[uint64]string),
+	}
+	return &r, nil
+}

db/leveldb/structs.go

@@ -0,0 +1,175 @@
+package leveldb
+
+import "github.com/Mrs4s/go-cqhttp/db"
+
+func (w *writer) writeStoredGroupMessage(x *db.StoredGroupMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.int32(x.GlobalID)
+	w.writeStoredMessageAttribute(x.Attribute)
+	w.string(x.SubType)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.int64(x.GroupCode)
+	w.string(x.AnonymousID)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredGroupMessage() *db.StoredGroupMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGroupMessage{}
+	x.ID = r.string()
+	x.GlobalID = r.int32()
+	x.Attribute = r.readStoredMessageAttribute()
+	x.SubType = r.string()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.GroupCode = r.int64()
+	x.AnonymousID = r.string()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredPrivateMessage(x *db.StoredPrivateMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.int32(x.GlobalID)
+	w.writeStoredMessageAttribute(x.Attribute)
+	w.string(x.SubType)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.int64(x.SessionUin)
+	w.int64(x.TargetUin)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredPrivateMessage() *db.StoredPrivateMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredPrivateMessage{}
+	x.ID = r.string()
+	x.GlobalID = r.int32()
+	x.Attribute = r.readStoredMessageAttribute()
+	x.SubType = r.string()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.SessionUin = r.int64()
+	x.TargetUin = r.int64()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredGuildChannelMessage(x *db.StoredGuildChannelMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.writeStoredGuildMessageAttribute(x.Attribute)
+	w.uint64(x.GuildID)
+	w.uint64(x.ChannelID)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredGuildChannelMessage() *db.StoredGuildChannelMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGuildChannelMessage{}
+	x.ID = r.string()
+	x.Attribute = r.readStoredGuildMessageAttribute()
+	x.GuildID = r.uint64()
+	x.ChannelID = r.uint64()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredMessageAttribute(x *db.StoredMessageAttribute) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.int32(x.MessageSeq)
+	w.int32(x.InternalID)
+	w.int64(x.SenderUin)
+	w.string(x.SenderName)
+	w.int64(x.Timestamp)
+}
+
+func (r *reader) readStoredMessageAttribute() *db.StoredMessageAttribute {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredMessageAttribute{}
+	x.MessageSeq = r.int32()
+	x.InternalID = r.int32()
+	x.SenderUin = r.int64()
+	x.SenderName = r.string()
+	x.Timestamp = r.int64()
+	return x
+}
+
+func (w *writer) writeStoredGuildMessageAttribute(x *db.StoredGuildMessageAttribute) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.uint64(x.MessageSeq)
+	w.uint64(x.InternalID)
+	w.uint64(x.SenderTinyID)
+	w.string(x.SenderName)
+	w.int64(x.Timestamp)
+}
+
+func (r *reader) readStoredGuildMessageAttribute() *db.StoredGuildMessageAttribute {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGuildMessageAttribute{}
+	x.MessageSeq = r.uint64()
+	x.InternalID = r.uint64()
+	x.SenderTinyID = r.uint64()
+	x.SenderName = r.string()
+	x.Timestamp = r.int64()
+	return x
+}
+
+func (w *writer) writeQuotedInfo(x *db.QuotedInfo) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.PrevID)
+	w.int32(x.PrevGlobalID)
+	w.arrayMsg(x.QuotedContent)
+}
+
+func (r *reader) readQuotedInfo() *db.QuotedInfo {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.QuotedInfo{}
+	x.PrevID = r.string()
+	x.PrevGlobalID = r.int32()
+	x.QuotedContent = r.arrayMsg()
+	return x
+}

db/leveldb/writer.go

@@ -0,0 +1,143 @@
+package leveldb
+
+import (
+	"bytes"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type intWriter struct {
+	bytes.Buffer
+}
+
+func (w *intWriter) varint(x int64) {
+	w.uvarint(uint64(x)<<1 ^ uint64(x>>63))
+}
+
+func (w *intWriter) uvarint(x uint64) {
+	for x >= 0x80 {
+		w.WriteByte(byte(x) | 0x80)
+		x >>= 7
+	}
+	w.WriteByte(byte(x))
+}
+
+// writer implements the index write.
+//
+// data format(use uvarint to encode integers):
+//
+//   - version
+//   - string data length
+//   - index data length
+//   - string data
+//   - index data
+//
+// for string data part, each string is encoded as:
+//
+//   - string length
+//   - string
+//
+// for index data part, each object value is encoded as:
+//
+//   - coder
+//   - value
+//
+// * coder is the identifier of value's type.
+// * specially for string, it's value is the offset in string data part.
+type writer struct {
+	data        intWriter
+	strings     intWriter
+	stringIndex map[string]uint64
+}
+
+func newWriter() *writer {
+	return &writer{
+		stringIndex: make(map[string]uint64),
+	}
+}
+
+func (w *writer) coder(o coder)    { w.data.WriteByte(byte(o)) }
+func (w *writer) varint(x int64)   { w.data.varint(x) }
+func (w *writer) uvarint(x uint64) { w.data.uvarint(x) }
+func (w *writer) nil()             { w.coder(coderNil) }
+func (w *writer) int(i int)        { w.varint(int64(i)) }
+func (w *writer) uint(i uint)      { w.uvarint(uint64(i)) }
+func (w *writer) int32(i int32)    { w.varint(int64(i)) }
+func (w *writer) uint32(i uint32)  { w.uvarint(uint64(i)) }
+func (w *writer) int64(i int64)    { w.varint(i) }
+func (w *writer) uint64(i uint64)  { w.uvarint(i) }
+
+func (w *writer) string(s string) {
+	off, ok := w.stringIndex[s]
+	if !ok {
+		// not found write to string data part
+		// | string length | string |
+		off = uint64(w.strings.Len())
+		w.strings.uvarint(uint64(len(s)))
+		_, _ = w.strings.WriteString(s)
+		w.stringIndex[s] = off
+	}
+	// write offset to index data part
+	w.uvarint(off)
+}
+
+func (w *writer) msg(m global.MSG) {
+	w.uvarint(uint64(len(m)))
+	for s, obj := range m {
+		w.string(s)
+		w.obj(obj)
+	}
+}
+
+func (w *writer) arrayMsg(a []global.MSG) {
+	w.uvarint(uint64(len(a)))
+	for _, v := range a {
+		w.msg(v)
+	}
+}
+
+func (w *writer) obj(o interface{}) {
+	switch x := o.(type) {
+	case nil:
+		w.nil()
+	case int:
+		w.coder(coderInt)
+		w.int(x)
+	case int32:
+		w.coder(coderInt32)
+		w.int32(x)
+	case int64:
+		w.coder(coderInt64)
+		w.int64(x)
+	case uint:
+		w.coder(coderUint)
+		w.uint(x)
+	case uint32:
+		w.coder(coderUint32)
+		w.uint32(x)
+	case uint64:
+		w.coder(coderUint64)
+		w.uint64(x)
+	case string:
+		w.coder(coderString)
+		w.string(x)
+	case global.MSG:
+		w.coder(coderMSG)
+		w.msg(x)
+	case []global.MSG:
+		w.coder(coderArrayMSG)
+		w.arrayMsg(x)
+	default:
+		panic("unsupported type")
+	}
+}
+
+func (w *writer) bytes() []byte {
+	var out intWriter
+	out.uvarint(dataVersion)
+	out.uvarint(uint64(w.strings.Len()))
+	out.uvarint(uint64(w.data.Len()))
+	_, _ = w.strings.WriteTo(&out)
+	_, _ = w.data.WriteTo(&out)
+	return out.Bytes()
+}

db/mongodb/mongodb.go

@@ -10,15 +10,21 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
-type MongoDBImpl struct {
+type database struct {
 	uri   string
 	db    string
 	mongo *mongo.Database
 }
 
+// config mongodb 相关配置
+type config struct {
+	Enable   bool   `yaml:"enable"`
+	URI      string `yaml:"uri"`
+	Database string `yaml:"database"`
+}
+
 const (
 	MongoGroupMessageCollection        = "group-messages"
 	MongoPrivateMessageCollection      = "private-messages"
@@ -26,8 +32,8 @@ const (
 )
 
 func init() {
-	db.Register("mongodb", func(node yaml.Node) db.Database {
-		conf := new(config.MongoDBConfig)
+	db.Register("database", func(node yaml.Node) db.Database {
+		conf := new(config)
 		_ = node.Decode(conf)
 		if conf.Database == "" {
 			conf.Database = "gocq-database"
@@ -35,11 +41,11 @@ func init() {
 		if !conf.Enable {
 			return nil
 		}
-		return &MongoDBImpl{uri: conf.URI, db: conf.Database}
+		return &database{uri: conf.URI, db: conf.Database}
 	})
 }
 
-func (m *MongoDBImpl) Open() error {
+func (m *database) Open() error {
 	cli, err := mongo.Connect(context.Background(), options.Client().ApplyURI(m.uri))
 	if err != nil {
 		return errors.Wrap(err, "open mongo connection error")
@@ -48,14 +54,14 @@ func (m *MongoDBImpl) Open() error {
 	return nil
 }
 
-func (m *MongoDBImpl) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
+func (m *database) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
 	if r, err := m.GetGroupMessageByGlobalID(id); err == nil {
 		return r, nil
 	}
 	return m.GetPrivateMessageByGlobalID(id)
 }
 
-func (m *MongoDBImpl) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+func (m *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
 	coll := m.mongo.Collection(MongoGroupMessageCollection)
 	var ret db.StoredGroupMessage
 	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
@@ -64,7 +70,7 @@ func (m *MongoDBImpl) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessag
 	return &ret, nil
 }
 
-func (m *MongoDBImpl) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+func (m *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
 	coll := m.mongo.Collection(MongoPrivateMessageCollection)
 	var ret db.StoredPrivateMessage
 	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
@@ -73,7 +79,7 @@ func (m *MongoDBImpl) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMe
 	return &ret, nil
 }
 
-func (m *MongoDBImpl) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+func (m *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
 	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
 	var ret db.StoredGuildChannelMessage
 	if err := coll.FindOne(context.Background(), bson.D{{"_id", id}}).Decode(&ret); err != nil {
@@ -82,19 +88,19 @@ func (m *MongoDBImpl) GetGuildChannelMessageByID(id string) (*db.StoredGuildChan
 	return &ret, nil
 }
 
-func (m *MongoDBImpl) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+func (m *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	coll := m.mongo.Collection(MongoGroupMessageCollection)
 	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
 	return errors.Wrap(err, "insert error")
 }
 
-func (m *MongoDBImpl) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+func (m *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	coll := m.mongo.Collection(MongoPrivateMessageCollection)
 	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
 	return errors.Wrap(err, "insert error")
 }
 
-func (m *MongoDBImpl) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+func (m *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
 	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
 	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
 	return errors.Wrap(err, "insert error")

db/multidb.go

@@ -45,6 +45,7 @@ func Open() error {
 			return errors.Wrap(err, "open backend error")
 		}
 	}
+	base.Database = nil
 	return nil
 }
 

db/sqlite3/model.go

@@ -0,0 +1,84 @@
+package sqlite3
+
+const (
+	Sqlite3GroupMessageTableName          = "grpmsg"
+	Sqlite3MessageAttributeTableName      = "msgattr"
+	Sqlite3GuildMessageAttributeTableName = "gmsgattr"
+	Sqlite3QuotedInfoTableName            = "quoinf"
+	Sqlite3PrivateMessageTableName        = "privmsg"
+	Sqlite3GuildChannelMessageTableName   = "guildmsg"
+	Sqlite3UinInfoTableName               = "uininf"
+	Sqlite3TinyInfoTableName              = "tinyinf"
+)
+
+// StoredMessageAttribute 持久化消息属性
+type StoredMessageAttribute struct {
+	ID         int64 // ID is the crc64 of 字段s below
+	MessageSeq int32
+	InternalID int32
+	SenderUin  int64 // SenderUin is fk to UinInfo
+	Timestamp  int64
+}
+
+// StoredGuildMessageAttribute 持久化频道消息属性
+type StoredGuildMessageAttribute struct {
+	ID           int64 // ID is the crc64 of 字段s below
+	MessageSeq   int64
+	InternalID   int64
+	SenderTinyID int64 // SenderTinyID is fk to TinyInfo
+	Timestamp    int64
+}
+
+// QuotedInfo 引用回复
+type QuotedInfo struct {
+	ID            int64 // ID is the crc64 of 字段s below
+	PrevID        string
+	PrevGlobalID  int32
+	QuotedContent string // QuotedContent is json of original content
+}
+
+// UinInfo QQ 与 昵称
+type UinInfo struct {
+	Uin  int64
+	Name string
+}
+
+// TinyInfo Tiny 与 昵称
+type TinyInfo struct {
+	ID   int64
+	Name string
+}
+
+// StoredGroupMessage 持久化群消息
+type StoredGroupMessage struct {
+	GlobalID     int32
+	ID           string
+	AttributeID  int64
+	SubType      string
+	QuotedInfoID int64
+	GroupCode    int64
+	AnonymousID  string
+	Content      string // Content is json of original content
+}
+
+// StoredPrivateMessage 持久化私聊消息
+type StoredPrivateMessage struct {
+	GlobalID     int32
+	ID           string
+	AttributeID  int64
+	SubType      string
+	QuotedInfoID int64
+	SessionUin   int64
+	TargetUin    int64
+	Content      string // Content is json of original content
+}
+
+// StoredGuildChannelMessage 持久化频道消息
+type StoredGuildChannelMessage struct {
+	ID           string
+	AttributeID  int64
+	GuildID      int64
+	ChannelID    int64
+	QuotedInfoID int64
+	Content      string // Content is json of original content
+}

db/sqlite3/sqlite3.go

@@ -0,0 +1,532 @@
+package sqlite3
+
+import (
+	"encoding/base64"
+	"hash/crc64"
+	"os"
+	"path"
+	"strconv"
+	"sync"
+	"time"
+
+	sql "github.com/FloatTech/sqlite"
+	"github.com/pkg/errors"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/Mrs4s/go-cqhttp/db"
+)
+
+type database struct {
+	sync.RWMutex
+	db  *sql.Sqlite
+	ttl time.Duration
+}
+
+// config mongodb 相关配置
+type config struct {
+	Enable   bool          `yaml:"enable"`
+	CacheTTL time.Duration `yaml:"cachettl"`
+}
+
+func init() {
+	sql.DriverName = "sqlite"
+	db.Register("sqlite3", func(node yaml.Node) db.Database {
+		conf := new(config)
+		_ = node.Decode(conf)
+		if !conf.Enable {
+			return nil
+		}
+		return &database{db: new(sql.Sqlite), ttl: conf.CacheTTL}
+	})
+}
+
+func (s *database) Open() error {
+	s.db.DBPath = path.Join("data", "sqlite3")
+	_ = os.MkdirAll(s.db.DBPath, 0755)
+	s.db.DBPath += "/msg.db"
+	err := s.db.Open(s.ttl)
+	if err != nil {
+		return errors.Wrap(err, "open sqlite3 error")
+	}
+	_, err = s.db.DB.Exec("PRAGMA foreign_keys = ON;")
+	if err != nil {
+		return errors.Wrap(err, "enable foreign_keys error")
+	}
+	err = s.db.Create(Sqlite3UinInfoTableName, &UinInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{Name: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3UinInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3TinyInfoTableName, &TinyInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3TinyInfoTableName, &TinyInfo{Name: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3TinyInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{},
+		"FOREIGN KEY(SenderUin) REFERENCES "+Sqlite3UinInfoTableName+"(Uin)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3MessageAttributeTableName+" error")
+	}
+	err = s.db.Create(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{},
+		"FOREIGN KEY(SenderTinyID) REFERENCES "+Sqlite3TinyInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3GuildMessageAttributeTableName+" error")
+	}
+	err = s.db.Create(Sqlite3QuotedInfoTableName, &QuotedInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{QuotedContent: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3QuotedInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3GroupMessageTableName, &StoredGroupMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Create(Sqlite3PrivateMessageTableName, &StoredPrivateMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Create(Sqlite3GuildChannelMessageTableName, &StoredGuildChannelMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	return nil
+}
+
+func (s *database) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
+	if r, err := s.GetGroupMessageByGlobalID(id); err == nil {
+		return r, nil
+	}
+	return s.GetPrivateMessageByGlobalID(id)
+}
+
+func (s *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+	var ret db.StoredGroupMessage
+	var grpmsg StoredGroupMessage
+	s.RLock()
+	err := s.db.Find(Sqlite3GroupMessageTableName, &grpmsg, "WHERE GlobalID="+strconv.Itoa(int(id)))
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = grpmsg.ID
+	ret.GlobalID = grpmsg.GlobalID
+	ret.SubType = grpmsg.SubType
+	ret.GroupCode = grpmsg.GroupCode
+	ret.AnonymousID = grpmsg.AnonymousID
+	_ = yaml.Unmarshal(utils.S2B(grpmsg.Content), &ret)
+	if grpmsg.AttributeID != 0 {
+		var attr StoredMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3MessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(grpmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var uin UinInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3UinInfoTableName, &uin, "WHERE Uin="+strconv.FormatInt(attr.SenderUin, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredMessageAttribute{
+					MessageSeq: attr.MessageSeq,
+					InternalID: attr.InternalID,
+					SenderUin:  attr.SenderUin,
+					SenderName: uin.Name,
+					Timestamp:  attr.Timestamp,
+				}
+			}
+		}
+	}
+	if grpmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(grpmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+	var ret db.StoredPrivateMessage
+	var privmsg StoredPrivateMessage
+	s.RLock()
+	err := s.db.Find(Sqlite3PrivateMessageTableName, &privmsg, "WHERE GlobalID="+strconv.Itoa(int(id)))
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = privmsg.ID
+	ret.GlobalID = privmsg.GlobalID
+	ret.SubType = privmsg.SubType
+	ret.SessionUin = privmsg.SessionUin
+	ret.TargetUin = privmsg.TargetUin
+	_ = yaml.Unmarshal(utils.S2B(privmsg.Content), &ret)
+	if privmsg.AttributeID != 0 {
+		var attr StoredMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3MessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(privmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var uin UinInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3UinInfoTableName, &uin, "WHERE Uin="+strconv.FormatInt(attr.SenderUin, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredMessageAttribute{
+					MessageSeq: attr.MessageSeq,
+					InternalID: attr.InternalID,
+					SenderUin:  attr.SenderUin,
+					SenderName: uin.Name,
+					Timestamp:  attr.Timestamp,
+				}
+			}
+		}
+	}
+	if privmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(privmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+	b, err := base64.StdEncoding.DecodeString(id)
+	if err != nil {
+		return nil, errors.Wrap(err, "query invalid id error")
+	}
+	if len(b) < 25 {
+		return nil, errors.New("query invalid id error: content too short")
+	}
+	var ret db.StoredGuildChannelMessage
+	var guildmsg StoredGuildChannelMessage
+	s.RLock()
+	err = s.db.Find(Sqlite3GuildChannelMessageTableName, &guildmsg, "WHERE ID='"+id+"'")
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = guildmsg.ID
+	ret.GuildID = uint64(guildmsg.GuildID)
+	ret.ChannelID = uint64(guildmsg.ChannelID)
+	_ = yaml.Unmarshal(utils.S2B(guildmsg.Content), &ret)
+	if guildmsg.AttributeID != 0 {
+		var attr StoredGuildMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3GuildMessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(guildmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var tiny TinyInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3TinyInfoTableName, &tiny, "WHERE ID="+strconv.FormatInt(attr.SenderTinyID, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredGuildMessageAttribute{
+					MessageSeq:   uint64(attr.MessageSeq),
+					InternalID:   uint64(attr.InternalID),
+					SenderTinyID: uint64(attr.SenderTinyID),
+					SenderName:   tiny.Name,
+					Timestamp:    attr.Timestamp,
+				}
+			}
+		}
+	}
+	if guildmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(guildmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+	grpmsg := &StoredGroupMessage{
+		GlobalID:    msg.GlobalID,
+		ID:          msg.ID,
+		SubType:     msg.SubType,
+		GroupCode:   msg.GroupCode,
+		AnonymousID: msg.AnonymousID,
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{
+			Uin:  msg.Attribute.SenderUin,
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{
+				ID:         id,
+				MessageSeq: msg.Attribute.MessageSeq,
+				InternalID: msg.Attribute.InternalID,
+				SenderUin:  msg.Attribute.SenderUin,
+				Timestamp:  msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			grpmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			grpmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	grpmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3GroupMessageTableName, grpmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}
+
+func (s *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+	privmsg := &StoredPrivateMessage{
+		GlobalID:   msg.GlobalID,
+		ID:         msg.ID,
+		SubType:    msg.SubType,
+		SessionUin: msg.SessionUin,
+		TargetUin:  msg.TargetUin,
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{
+			Uin:  msg.Attribute.SenderUin,
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{
+				ID:         id,
+				MessageSeq: msg.Attribute.MessageSeq,
+				InternalID: msg.Attribute.InternalID,
+				SenderUin:  msg.Attribute.SenderUin,
+				Timestamp:  msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			privmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			privmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	privmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3PrivateMessageTableName, privmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}
+
+func (s *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+	guildmsg := &StoredGuildChannelMessage{
+		ID:        msg.ID,
+		GuildID:   int64(msg.GuildID),
+		ChannelID: int64(msg.ChannelID),
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderTinyID))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3TinyInfoTableName, &TinyInfo{
+			ID:   int64(msg.Attribute.SenderTinyID),
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredGuildMessageAttribute{
+				ID:           id,
+				MessageSeq:   int64(msg.Attribute.MessageSeq),
+				InternalID:   int64(msg.Attribute.InternalID),
+				SenderTinyID: int64(msg.Attribute.SenderTinyID),
+				Timestamp:    msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			guildmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			guildmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	guildmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3GuildChannelMessageTableName, guildmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}

docker-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+USER=abc
+
+echo "---Setup Timezone to ${TZ}---"
+echo "${TZ}" > /etc/timezone
+echo "---Checking if UID: ${UID} matches user---"
+usermod -o -u ${UID} ${USER}
+echo "---Checking if GID: ${GID} matches user---"
+groupmod -o -g ${GID} ${USER} > /dev/null 2>&1 ||:
+usermod -g ${GID} ${USER}
+echo "---Setting umask to ${UMASK}---"
+umask ${UMASK}
+
+echo "---Taking ownership of data...---"
+chown -R ${UID}:${GID} /app /data
+chmod +x /app/cqhttp
+
+echo "Starting..."
+su-exec ${USER} /app/cqhttp

docs/EventFilter.md

@@ -163,9 +163,9 @@
 
 ## 过滤时的事件数据对象
 
-过滤器在go-cqhttp构建好事件数据后运行，各事件的数据字段见[OneBot标准]( https://github.com/howmanybots/onebot/blob/master/v11/specs/event/README.md )。
+过滤器在go-cqhttp构建好事件数据后运行，各事件的数据字段见[OneBot标准]( https://github.com/botuniverse/onebot-11/blob/master/event/README.md )。
 
 这里有几点需要注意：
 
-- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
+- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/botuniverse/onebot-11/blob/master/message/array.md )）
 - `raw_message` 字段为未经**CQ码**处理的原始消息字符串，这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

docs/config.md

@@ -79,21 +79,13 @@ default-middlewares: &default
     frequency: 1  # 令牌回复频率, 单位秒
     bucket: 1     # 令牌桶大小
 
-database: # 数据库相关设置
-  leveldb:
-    # 是否启用内置leveldb数据库
-    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
-    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
-    enable: true
-
 # 连接服务列表
 servers:
   # HTTP 通信设置
   - http:
       # 服务端监听地址
-      host: 127.0.0.1
-      # 服务端监听端口
-      port: 5700
+      # 如需指定监听ipv4， 可使用 `address: tcp4://0.0.0.0:5700` (ipv6同理)
+      address: 0.0.0.0:5700
       # 反向HTTP超时时间, 单位秒
       # 最小值为5，小于5将会忽略本项设置
       timeout: 5
@@ -109,9 +101,8 @@ servers:
   # 正向WS设置
   - ws:
       # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
+      # 如需指定监听ipv4， 可使用 `address: tcp4://0.0.0.0:6700` (ipv6同理)
+      address: 0.0.0.0:6700
       middlewares:
         <<: *default # 引用默认中间件
 

docs/cqhttp.md

@@ -42,6 +42,8 @@
 - [设置群名](#设置群名)
 - [获取用户VIP信息](#获取用户vip信息)
 - [发送群公告](#发送群公告)
+- [获取群公告](#获取群公告)
+- [删除群公告](#删除群公告)
 - [设置精华消息](#设置精华消息)
 - [移出精华消息](#移出精华消息)
 - [获取精华消息列表](#获取精华消息列表)
@@ -244,7 +246,8 @@ Type: `node`
 | `seq`     | message | 具体消息       | 用于自定义消息                                                                         |
 
 特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.
-另外按 [CQHTTP](https://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
+另外按 [Onebot v11](https://github.com/botuniverse/onebot-11/blob/master/message/array.md) 文档说明, `data` 应全为字符串,
+但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
 示例:
 
@@ -491,6 +494,18 @@ Type: `tts`
 
 示例: `[CQ:tts,text=这是一条测试消息]`
 
+### 猜拳消息
+
+Type: `rps`
+
+参数:
+
+| 参数名     | 类型  | 说明               |
+|---------|-----|------------------|
+| `value` | int | 0：石头, 1：剪刀, 2：布  |
+
+示例: `[CQ:rps,value=0]`
+
 ## API
 
 ### 设置群名
@@ -613,15 +628,16 @@ Type: `tts`
 }
 ````
 
-### 发送合并转发(群)
+### 发送合并转发(群/私聊)
 
-终结点: `/send_group_forward_msg`
+终结点: `/send_group_forward_msg`, `send_private_forward_msg`, `send_forward_msg`
 
 **参数**
 
 | 字段         | 类型             | 说明                                                                                                                                                            |
-| ---------- | -------------- | ---------------------------- |
+|------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `group_id` | int64          | 群号                                                                                                                                                            |
+| `user_id`  | int64          | 私聊QQ号                                                                                                                                                         |
 | `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) |
 
 响应数据
@@ -883,6 +899,36 @@ Type: `tts`
 > 在不提供 `folder` 参数的情况下默认上传到根目录
 > 只能上传本地文件, 需要上传 `http` 文件的话请先调用 `download_file` API下载
 
+### 上传私聊文件
+
+终结点: `/upload_private_file`
+
+**参数**
+
+| 字段        | 类型     | 说明     |
+|-----------|--------|--------|
+| `user_id` | int64  | 接收者id  |
+| `file`    | string | 本地文件路径 |
+| `name`    | string | 储存名称   |
+
+> 只能上传本地文件, 需要上传 `http` 文件的话请先调用 `download_file` API下载
+
+### 设置 QQ 个人资料
+
+终结点: `/set_qq_profile`
+
+**参数**
+
+| 字段              | 类型     | 说明   |
+|-----------------|--------|------|
+| `nickname`      | int64  | 昵称   |
+| `company`       | string | 公司   |
+| `email`         | string | 邮箱   |
+| `college`       | string | 大学   |
+| `personal_note` | string | 个人签名 |
+
+> 所有参数字段都为可选。
+
 ### 获取状态
 
 终结点: `/get_status`
@@ -1065,6 +1111,60 @@ JSON数组:
 
 `该 API 没有响应数据`
 
+### 获取群公告
+
+终结点： `/_get_group_notice`
+
+**参数**
+
+| 字段名     | 数据类型 | 默认值 | 说明     |
+| ---------- | -------- | ------ | -------- |
+| `group_id` | int64    |        | 群号     |
+
+**响应数据**
+
+数组信息:
+
+| 字段名            | 数据类型   | 默认值 | 说明    |
+|----------------|--------| ------ |-------|
+| `notice_id`    | string |        | 公告id  |
+| `sender_id`    | string |        | 发布者id |
+| `publish_time` | string |        | 发布时间  |
+| `message`      | GroupNoticeMessage |        | 公告id  |
+
+响应示例
+
+```json
+{
+  "data": [
+    {
+      "notice_id": "8850de2e00000000cc6bbd628a150c00",
+      "sender_id": 1111111,
+      "publish_time": 1656581068,
+      "message": {
+        "text": "这是一条公告",
+        "images": []
+      }
+    }
+  ],
+  "retcode": 0,
+  "status": "ok"
+}
+```
+
+### 删除群公告
+
+终结点： `/_del_group_notice`
+
+**参数**
+
+| 字段名         | 数据类型 | 默认值 | 说明   |
+|-------------| -------- | ------ |------|
+| `group_id`  | int64    |        | 群号   |
+| `notice_id` | string   |        | 公告id |
+
+`该 API 没有响应数据`
+
 ### 获取单向好友列表
 
 终结点: `/get_unidirectional_friend_list`

global/buffer.go

@@ -2,26 +2,16 @@ package global
 
 import (
 	"bytes"
-	"sync"
-)
 
-var bufferPool = sync.Pool{
-	New: func() interface{} {
-		return new(bytes.Buffer)
-	},
-}
+	"github.com/Mrs4s/MiraiGo/binary" // 和 MiraiGo 共用同一 buffer 池
+)
 
 // NewBuffer 从池中获取新 bytes.Buffer
 func NewBuffer() *bytes.Buffer {
-	return bufferPool.Get().(*bytes.Buffer)
+	return (*bytes.Buffer)(binary.SelectWriter())
 }
 
 // PutBuffer 将 Buffer放入池中
 func PutBuffer(buf *bytes.Buffer) {
-	// See https://golang.org/issue/23199
-	const maxSize = 1 << 16
-	if buf != nil && buf.Cap() < maxSize { // 对于大Buffer直接丢弃
-		buf.Reset()
-		bufferPool.Put(buf)
-	}
+	binary.PutWriter((*binary.Writer)(buf))
 }

global/codec.go

@@ -43,6 +43,6 @@ func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
 
 // ExtractCover 获取给定视频文件的Cover
 func ExtractCover(src string, target string) error {
-	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-ss", "0", "-frames:v", "1", target)
 	return errors.Wrap(cmd.Run(), "extract video cover failed")
 }

global/fs.go

@@ -5,44 +5,36 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
-	"net"
+	"net/netip"
 	"net/url"
 	"os"
 	"path"
 	"runtime"
-	"strconv"
 	"strings"
 
 	"github.com/Mrs4s/MiraiGo/utils"
+	b14 "github.com/fumiama/go-base16384"
+	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 const (
 	// ImagePath go-cqhttp使用的图片缓存目录
 	ImagePath = "data/images"
-	// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
-	ImagePathOld = "data/image"
 	// VoicePath go-cqhttp使用的语音缓存目录
 	VoicePath = "data/voices"
-	// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
-	VoicePathOld = "data/record"
 	// VideoPath go-cqhttp使用的视频缓存目录
 	VideoPath = "data/videos"
 	// CachePath go-cqhttp使用的缓存目录
 	CachePath = "data/cache"
 	// DumpsPath go-cqhttp使用错误转储目录
 	DumpsPath = "dumps"
-)
-
-var (
-	// ErrSyntax Path语法错误时返回的错误
-	ErrSyntax = errors.New("syntax error")
 	// HeaderAmr AMR文件头
-	HeaderAmr = []byte("#!AMR")
+	HeaderAmr = "#!AMR"
 	// HeaderSilk Silkv3文件头
-	HeaderSilk = []byte("\x02#!SILK_V3")
+	HeaderSilk = "\x02#!SILK_V3"
 )
 
 // PathExists 判断给定path是否存在
@@ -78,13 +70,13 @@ func Check(err error, deleteSession bool) {
 
 // IsAMRorSILK 判断给定文件是否为Amr或Silk格式
 func IsAMRorSILK(b []byte) bool {
-	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
+	return bytes.HasPrefix(b, []byte(HeaderAmr)) || bytes.HasPrefix(b, []byte(HeaderSilk))
 }
 
 // FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
 // 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
 func FindFile(file, cache, p string) (data []byte, err error) {
-	data, err = nil, ErrSyntax
+	data, err = nil, os.ErrNotExist
 	switch {
 	case strings.HasPrefix(file, "http"): // https also has prefix http
 		hash := md5.Sum([]byte(file))
@@ -92,16 +84,21 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 		if (cache == "" || cache == "1") && PathExists(cacheFile) {
 			return os.ReadFile(cacheFile)
 		}
-		data, err = GetBytes(file)
-		_ = os.WriteFile(cacheFile, data, 0o644)
+		err = download.Request{URL: file}.WriteToFile(cacheFile)
 		if err != nil {
 			return nil, err
 		}
 	case strings.HasPrefix(file, "base64"):
-		data, err = param.Base64DecodeString(strings.TrimPrefix(file, "base64://"))
+		data, err = base64.StdEncoding.DecodeString(strings.TrimPrefix(file, "base64://"))
 		if err != nil {
 			return nil, err
 		}
+	case strings.HasPrefix(file, "base16384"):
+		data, err = b14.UTF82UTF16BE(utils.S2B(strings.TrimPrefix(file, "base16384://")))
+		if err != nil {
+			return nil, err
+		}
+		data = b14.Decode(data)
 	case strings.HasPrefix(file, "file"):
 		var fu *url.URL
 		fu, err = url.Parse(file)
@@ -138,19 +135,18 @@ func DelFile(path string) bool {
 }
 
 // ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
-func ReadAddrFile(path string) []*net.TCPAddr {
+func ReadAddrFile(path string) []netip.AddrPort {
 	d, err := os.ReadFile(path)
 	if err != nil {
 		return nil
 	}
 	str := string(d)
 	lines := strings.Split(str, "\n")
-	var ret []*net.TCPAddr
+	var ret []netip.AddrPort
 	for _, l := range lines {
-		ip := strings.Split(strings.TrimSpace(l), ":")
-		if len(ip) == 2 {
-			port, _ := strconv.Atoi(ip[1])
-			ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
+		addr, err := netip.ParseAddrPort(l)
+		if err == nil {
+			ret = append(ret, addr)
 		}
 	}
 	return ret

global/log_hook.go

@@ -195,7 +195,8 @@ func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
 		buf.WriteString(colorReset)
 	}
 
-	ret := append([]byte(nil), buf.Bytes()...) // copy buffer
+	ret := make([]byte, len(buf.Bytes()))
+	copy(ret, buf.Bytes()) // copy buffer
 	return ret, nil
 }
 

global/net.go

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

global/param.go

@@ -8,7 +8,7 @@ import (
 )
 
 // MSG 消息Map
-type MSG map[string]interface{}
+type MSG = map[string]interface{}
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
 //

global/quote.go

@@ -0,0 +1,146 @@
+package global
+
+import (
+	"strconv"
+	"unicode/utf8"
+)
+
+const (
+	lowerhex = "0123456789abcdef"
+	upperhex = "0123456789ABCDEF"
+)
+
+// Quote returns a double-quoted Go string literal representing s. The
+// returned string uses Go escape sequences (\t, \n, \xFF, \u0100) for
+// control characters and non-printable characters as defined by
+// IsPrint.
+func Quote(s string) string {
+	return quoteWith(s, '"', false, false)
+}
+
+func quoteWith(s string, quote byte, asciiOnly, graphicOnly bool) string {
+	return string(appendQuotedWith(make([]byte, 0, 3*len(s)/2), s, quote, asciiOnly, graphicOnly))
+}
+
+func appendQuotedWith(buf []byte, s string, quote byte, asciiOnly, graphicOnly bool) []byte {
+	// Often called with big strings, so preallocate. If there's quoting,
+	// this is conservative but still helps a lot.
+	if cap(buf)-len(buf) < len(s) {
+		nBuf := make([]byte, len(buf), len(buf)+1+len(s)+1)
+		copy(nBuf, buf)
+		buf = nBuf
+	}
+	buf = append(buf, quote)
+	for width := 0; len(s) > 0; s = s[width:] {
+		r := rune(s[0])
+		width = 1
+		if r >= utf8.RuneSelf {
+			r, width = utf8.DecodeRuneInString(s)
+		}
+		if width == 1 && r == utf8.RuneError {
+			buf = append(buf, `\x`...)
+			buf = append(buf, lowerhex[s[0]>>4])
+			buf = append(buf, lowerhex[s[0]&0xF])
+			continue
+		}
+		buf = appendEscapedRune(buf, r, quote, asciiOnly, graphicOnly)
+	}
+	buf = append(buf, quote)
+	return buf
+}
+func appendEscapedRune(buf []byte, r rune, quote byte, asciiOnly, graphicOnly bool) []byte {
+	var runeTmp [utf8.UTFMax]byte
+	if r == rune(quote) || r == '\\' { // always backslashed
+		buf = append(buf, '\\')
+		buf = append(buf, byte(r))
+		return buf
+	}
+	if asciiOnly {
+		if r < utf8.RuneSelf && strconv.IsPrint(r) {
+			buf = append(buf, byte(r))
+			return buf
+		}
+	} else if strconv.IsPrint(r) || graphicOnly && isInGraphicList(r) {
+		n := utf8.EncodeRune(runeTmp[:], r)
+		buf = append(buf, runeTmp[:n]...)
+		return buf
+	}
+	switch r {
+	case '\a':
+		buf = append(buf, `\a`...)
+	case '\b':
+		buf = append(buf, `\b`...)
+	case '\f':
+		buf = append(buf, `\f`...)
+	case '\n':
+		buf = append(buf, `\n`...)
+	case '\r':
+		buf = append(buf, `\r`...)
+	case '\t':
+		buf = append(buf, `\t`...)
+	case '\v':
+		buf = append(buf, `\v`...)
+	default:
+		switch {
+		case !utf8.ValidRune(r):
+			r = 0xFFFD
+			fallthrough
+		case r < 0x10000:
+			buf = append(buf, `\u`...)
+			for s := 12; s >= 0; s -= 4 {
+				buf = append(buf, lowerhex[r>>uint(s)&0xF])
+			}
+		default:
+			buf = append(buf, `\U`...)
+			for s := 28; s >= 0; s -= 4 {
+				buf = append(buf, lowerhex[r>>uint(s)&0xF])
+			}
+		}
+	}
+	return buf
+}
+
+func isInGraphicList(r rune) bool {
+	// We know r must fit in 16 bits - see makeisprint.go.
+	if r > 0xFFFF {
+		return false
+	}
+	rr := uint16(r)
+	i := bsearch16(isGraphic, rr)
+	return i < len(isGraphic) && rr == isGraphic[i]
+}
+
+// bsearch16 returns the smallest i such that a[i] >= x.
+// If there is no such i, bsearch16 returns len(a).
+func bsearch16(a []uint16, x uint16) int {
+	i, j := 0, len(a)
+	for i < j {
+		h := i + (j-i)>>1
+		if a[h] < x {
+			i = h + 1
+		} else {
+			j = h
+		}
+	}
+	return i
+}
+
+// isGraphic lists the graphic runes not matched by IsPrint.
+var isGraphic = []uint16{
+	0x00a0,
+	0x1680,
+	0x2000,
+	0x2001,
+	0x2002,
+	0x2003,
+	0x2004,
+	0x2005,
+	0x2006,
+	0x2007,
+	0x2008,
+	0x2009,
+	0x200a,
+	0x202f,
+	0x205f,
+	0x3000,
+}

global/terminal/double_click_windows.go

@@ -6,15 +6,16 @@ package terminal
 import (
 	"os"
 	"path/filepath"
-	"syscall"
 	"unsafe"
 
+	"golang.org/x/sys/windows"
+
 	"github.com/pkg/errors"
 )
 
 // RunningByDoubleClick 检查是否通过双击直接运行
 func RunningByDoubleClick() bool {
-	kernel32 := syscall.NewLazyDLL("kernel32.dll")
+	kernel32 := windows.NewLazySystemDLL("kernel32.dll")
 	lp := kernel32.NewProc("GetConsoleProcessList")
 	if lp != nil {
 		var ids [2]uint32
@@ -29,7 +30,8 @@ func RunningByDoubleClick() bool {
 
 // NoMoreDoubleClick 提示用户不要双击运行，并生成安全启动脚本
 func NoMoreDoubleClick() error {
-	r := boxW(0, "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
+	toHighDPI()
+	r := boxW(getConsoleWindows(), "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
 	if r == 2 {
 		return nil
 	}
@@ -59,9 +61,10 @@ func NoMoreDoubleClick() error {
 
 // 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(
+	captionPtr, _ := windows.UTF16PtrFromString(caption)
+	titlePtr, _ := windows.UTF16PtrFromString(title)
+	u32 := windows.NewLazySystemDLL("user32.dll")
+	ret, _, _ := u32.NewProc("MessageBoxW").Call(
 		hwnd,
 		uintptr(unsafe.Pointer(captionPtr)),
 		uintptr(unsafe.Pointer(titlePtr)),
@@ -69,3 +72,23 @@ func boxW(hwnd uintptr, caption, title string, flags uint) int {
 
 	return int(ret)
 }
+
+// GetConsoleWindows retrieves the window handle used by the console associated with the calling process.
+func getConsoleWindows() (hWnd uintptr) {
+	hWnd, _, _ = windows.NewLazySystemDLL("kernel32.dll").NewProc("GetConsoleWindow").Call()
+	return
+}
+
+// toHighDPI tries to raise DPI awareness context to DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED
+func toHighDPI() {
+	systemAware := ^uintptr(2) + 1
+	unawareGDIScaled := ^uintptr(5) + 1
+	u32 := windows.NewLazySystemDLL("user32.dll")
+	proc := u32.NewProc("SetThreadDpiAwarenessContext")
+	if proc.Find() != nil {
+		return
+	}
+	for i := unawareGDIScaled; i <= systemAware; i++ {
+		_, _, _ = u32.NewProc("SetThreadDpiAwarenessContext").Call(i)
+	}
+}

go.mod

@@ -1,62 +1,69 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.17
+go 1.19
 
 require (
-	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Microsoft/go-winio v0.5.1
-	github.com/Mrs4s/MiraiGo v0.0.0-20220209092529-5d071b034c17
+	github.com/FloatTech/sqlite v1.5.7
+	github.com/Microsoft/go-winio v0.6.0
+	github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd
+	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc
-	github.com/dustin/go-humanize v1.0.0
+	github.com/fumiama/go-base16384 v1.6.1
 	github.com/fumiama/go-hide-param v0.1.4
-	github.com/gabriel-vasile/mimetype v1.4.0
-	github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/klauspost/compress v1.13.6
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/mattn/go-colorable v0.1.12
+	github.com/mattn/go-colorable v0.1.13
 	github.com/pkg/errors v0.9.1
-	github.com/segmentio/asm v1.1.3
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
-	github.com/syndtr/goleveldb v1.0.0
-	github.com/tidwall/gjson v1.12.1
+	github.com/segmentio/asm v1.2.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.1
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+	github.com/tidwall/gjson v1.14.4
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	go.mongodb.org/mongo-driver v1.8.1
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	go.mongodb.org/mongo-driver v1.11.0
+	golang.org/x/crypto v0.3.0
+	golang.org/x/sys v0.2.0
+	golang.org/x/term v0.2.0
+	golang.org/x/time v0.2.0
+	gopkg.ilharper.com/x/isatty v1.1.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956 // indirect
+	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b // indirect
+	github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fumiama/imgsz v0.0.2 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/gocq/rs v1.0.1 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/google/uuid v1.1.0 // indirect
-	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/lestrrat-go/strftime v1.0.5 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/pierrec/lz4/v4 v4.1.11 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/jonboulle/clockwork v0.3.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // 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.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.0.2 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/xdg-go/scram v1.1.1 // indirect
+	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	modernc.org/libc v1.8.1 // indirect
-	modernc.org/mathutil v1.2.2 // indirect
-	modernc.org/memory v1.0.4 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/tools v0.1.12 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.21.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.4.0 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/sqlite v1.20.0 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.0.1 // indirect
 )
+
+replace github.com/remyoudompheng/bigfft => github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b

go.sum

@@ -1,53 +1,59 @@
-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/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
-github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20220209092529-5d071b034c17 h1:OQVnlWt5if0TOFoNGDjILazBjVTncSlPxGXabD+4MvE=
-github.com/Mrs4s/MiraiGo v0.0.0-20220209092529-5d071b034c17/go.mod h1:rtKLkhMEi2YjsrXaNztT4uagUOPBxf6a+TNREkG097I=
-github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956 h1:hnaAkKz4t+xpSNVp5mnuloRMd3Rj2Lfg5biZ3emv//c=
-github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
+github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
+github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
+github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
+github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
+github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd h1:rzAbPc++5CJ1VZDjq/eORXOWMMGsDN3DMAPMXfI7Fvs=
+github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd/go.mod h1:lecSP26qedhinCceWn1x02dLDxGotH5nTFlpIMilmVM=
+github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0 h1:GEwcB4dL9vc4veW1fLNt0Fby3wspVflAn5v9/HbUwDM=
+github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
+github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
+github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
-github.com/bits-and-blooms/bitset v1.2.1 h1:M+/hrU9xlMp7t4TyTDQW97d3tRPVuKFC6zBEK16QnXY=
-github.com/bits-and-blooms/bitset v1.2.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b h1:Zt3pFQditAdWTHCOVkiloc9ZauBoWrb37guFV4iIRvE=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/fumiama/go-base16384 v1.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30=
+github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
 github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU=
 github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
 github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
 github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
-github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
-github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98 h1:NJDZEa7gibUa0w4tie8qKeQFKdeKFUbecWyQDPdRx40=
-github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98/go.mod h1:E5TBHc60dsWtOL7sbXCb3P9i4xrj2J7Zm5sEJftIc1w=
-github.com/gocq/rs v1.0.1 h1:ng7nhXmnx3SnfM0DOqmbP6GmQp1xGwRG9XmBiLFDWuM=
-github.com/gocq/rs v1.0.1/go.mod h1:8oaQnRvqn1fMh8i5zsetgQo03OUXksJV1k+dpmExxcY=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.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.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/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/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/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
+github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -55,46 +61,50 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
 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.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE=
-github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
+github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pierrec/lz4/v4 v4.1.11 h1:LVs17FAZJFOjgmJXl9Tf13WfLUvZq7/RjfEJrnwZ9OE=
-github.com/pierrec/lz4/v4 v4.1.11/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
-github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
-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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/tidwall/gjson v1.11.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.12.1 h1:ikuZsLdhr8Ws0IdROXUS1Gi4v9Z4pGqpX/CvJkxvfpo=
-github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -104,78 +114,113 @@ github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0V
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
-github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-go.mongodb.org/mongo-driver v1.8.1 h1:OZE4Wni/SJlrcmSIBRYNzunX5TKxjrTS4jKSnA99oKU=
-go.mongodb.org/mongo-driver v1.8.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
+go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 h1:0qxwC5n+ttVOINCBeRHO0nq9X7uy8SDsPoi5OaCdIEI=
-golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE=
+golang.org/x/time v0.2.0/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-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.ilharper.com/x/isatty v1.1.0 h1:slOK6hP9/y9mJWyCInMwnT432NExfWyYV2SsebdYOCY=
+gopkg.ilharper.com/x/isatty v1.1.0/go.mod h1:ofpv77Td5qQO6R1dmDd3oNt8TZdRo+l5gYAMxopRyS0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
+modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
+modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
+modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.21.5 h1:xBkU9fnHV+hvZuPSRszN0AXDG4M7nwPLwTWwkYcvLCI=
+modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
+modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.20.0 h1:80zmD3BGkm8BZ5fUi/4lwJQHiO3GXgIUvZRXpoIfROY=
+modernc.org/sqlite v1.20.0/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw=
+modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
+modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=

internal/base/feature.go

@@ -1,8 +1,6 @@
 package base
 
 import (
-	"io"
-
 	"github.com/pkg/errors"
 )
 
@@ -19,13 +17,3 @@ func encodeSilk(_ []byte, _ string) ([]byte, error) {
 func resampleSilk(data []byte) []byte {
 	return data
 }
-
-// Mime scan feature
-var (
-	IsLawfulImage = nocheck // 检查图片MIME
-	IsLawfulAudio = nocheck // 检查音频MIME
-)
-
-func nocheck(_ io.ReadSeeker) (bool, string) {
-	return true, ""
-}

internal/base/flag.go

@@ -5,10 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -57,9 +53,7 @@ var (
 
 // Parse parse flags
 func Parse() {
-	wd, _ := os.Getwd()
-	dc := path.Join(wd, "config.yml")
-	flag.StringVar(&LittleC, "c", dc, "configuration filename")
+	flag.StringVar(&LittleC, "c", "config.yml", "configuration filename")
 	flag.BoolVar(&LittleD, "d", false, "running as a daemon")
 	flag.BoolVar(&LittleH, "h", false, "this Help")
 	flag.StringVar(&LittleWD, "w", "", "cover the working directory")
@@ -127,27 +121,3 @@ Options:
 	flag.PrintDefaults()
 	os.Exit(0)
 }
-
-// ResetWorkingDir 重设工作路径
-func ResetWorkingDir() {
-	wd := LittleWD
-	args := make([]string, 0, len(os.Args))
-	for i := 1; i < len(os.Args); i++ {
-		if os.Args[i] == "-w" {
-			i++ // skip value field
-		} else if !strings.HasPrefix(os.Args[i], "-w") {
-			args = append(args, os.Args[i])
-		}
-	}
-	p, _ := filepath.Abs(os.Args[0])
-	proc := exec.Command(p, args...)
-	proc.Stdin = os.Stdin
-	proc.Stdout = os.Stdout
-	proc.Stderr = os.Stderr
-	proc.Dir = wd
-	err := proc.Run()
-	if err != nil {
-		panic(err)
-	}
-	os.Exit(0)
-}

internal/btree/btree.go

@@ -1,553 +0,0 @@
-// Package btree provide a disk-based btree
-package btree
-
-import (
-	"io"
-	"math/rand"
-	"os"
-	"unsafe"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	hashSize        = 16 // md5 hash
-	tableSize       = (1024 - 1) / int(unsafe.Sizeof(item{}))
-	cacheSlots      = 11 // prime
-	superSize       = int(unsafe.Sizeof(super{}))
-	tableStructSize = int(unsafe.Sizeof(table{}))
-)
-
-type item struct {
-	hash   [hashSize]byte
-	offset int64
-	child  int64
-}
-
-type table struct {
-	items [tableSize]item
-	size  int
-}
-
-type cache struct {
-	table  *table
-	offset int64
-}
-
-type super struct {
-	top     int64
-	freeTop int64
-	alloc   int64
-}
-
-// DB ...
-type DB struct {
-	fd      *os.File
-	top     int64
-	freeTop int64
-	alloc   int64
-	cache   [cacheSlots]cache
-
-	inAllocator  bool
-	deleteLarger bool
-	fqueue       [freeQueueLen]chunk
-	fqueueLen    int
-}
-
-func (d *DB) get(offset int64) *table {
-	assert(offset != 0)
-
-	// take from cache
-	slot := &d.cache[offset%cacheSlots]
-	if slot.offset == offset {
-		return slot.table
-	}
-
-	table := new(table)
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := readTable(d.fd, table)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	return table
-}
-
-func (d *DB) put(t *table, offset int64) {
-	assert(offset != 0)
-
-	// overwrite cache
-	slot := &d.cache[offset%cacheSlots]
-	slot.table = t
-	slot.offset = offset
-}
-
-func (d *DB) flush(t *table, offset int64) {
-	assert(offset != 0)
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := writeTable(d.fd, t)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	d.put(t, offset)
-}
-
-func (d *DB) flushSuper() {
-	d.fd.Seek(0, io.SeekStart)
-	super := super{
-		top:     d.top,
-		freeTop: d.freeTop,
-		alloc:   d.alloc,
-	}
-	err := writeSuper(d.fd, &super)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-}
-
-// Open opens an existed btree file
-func Open(name string) (*DB, error) {
-	btree := new(DB)
-	fd, err := os.OpenFile(name, os.O_RDWR, 0o644)
-	if err != nil {
-		return nil, errors.Wrap(err, "btree open file failed")
-	}
-	btree.fd = fd
-
-	super := super{}
-	err = readSuper(fd, &super)
-	btree.top = super.top
-	btree.freeTop = super.freeTop
-	btree.alloc = super.alloc
-	return btree, errors.Wrap(err, "btree read meta info failed")
-}
-
-// Create creates a database
-func Create(name string) (*DB, error) {
-	btree := new(DB)
-	fd, err := os.OpenFile(name, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0o644)
-	if err != nil {
-		return nil, errors.Wrap(err, "btree open file failed")
-	}
-
-	btree.fd = fd
-	btree.alloc = int64(superSize)
-	btree.flushSuper()
-	return btree, nil
-}
-
-// Close closes the database
-func (d *DB) Close() error {
-	_ = d.fd.Sync()
-	err := d.fd.Close()
-	for i := 0; i < cacheSlots; i++ {
-		d.cache[i] = cache{}
-	}
-	return errors.Wrap(err, "btree close failed")
-}
-
-func collapse(bt *DB, offset int64) int64 {
-	table := bt.get(offset)
-	if table.size != 0 {
-		/* unable to collapse */
-		bt.put(table, offset)
-		return offset
-	}
-	ret := table.items[0].child
-	bt.put(table, offset)
-
-	/*
-	 * WARNING: this is dangerous as the chunk is added to allocation tree
-	 * before the references to it are removed!
-	 */
-	bt.freeChunk(offset, int(unsafe.Sizeof(table)))
-	return ret
-}
-
-// split a table. The pivot item is stored to 'hash' and 'offset'.
-// Returns offset to the new table.
-func (d *DB) split(t *table, hash *byte, offset *int64) int64 {
-	copyhash(hash, &t.items[tableSize/2].hash[0])
-	*offset = t.items[tableSize/2].offset
-
-	ntable := new(table)
-	ntable.size = t.size - tableSize/2 - 1
-
-	t.size = tableSize / 2
-
-	copy(ntable.items[:ntable.size+1], t.items[tableSize/2+1:])
-
-	noff := d.allocChunk(tableStructSize)
-	d.flush(ntable, noff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return noff
-}
-
-// takeSmallest find and remove the smallest item from the given table. The key of the item
-// is stored to 'hash'. Returns offset to the item
-func (d *DB) takeSmallest(toff int64, sha1 *byte) int64 {
-	table := d.get(toff)
-	assert(table.size > 0)
-
-	var off int64
-	child := table.items[0].child
-	if child == 0 {
-		off = d.remove(table, 0, sha1)
-	} else {
-		/* recursion */
-		off = d.takeSmallest(child, sha1)
-		table.items[0].child = collapse(d, child)
-	}
-	d.flush(table, toff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return off
-}
-
-// takeLargest find and remove the largest item from the given table. The key of the item
-// is stored to 'hash'. Returns offset to the item
-func (d *DB) takeLargest(toff int64, hash *byte) int64 {
-	table := d.get(toff)
-	assert(table.size > 0)
-
-	var off int64
-	child := table.items[table.size].child
-	if child == 0 {
-		off = d.remove(table, table.size-1, hash)
-	} else {
-		/* recursion */
-		off = d.takeLargest(child, hash)
-		table.items[table.size].child = collapse(d, child)
-	}
-	d.flush(table, toff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return off
-}
-
-// remove an item in position 'i' from the given table. The key of the
-// removed item is stored to 'hash'. Returns offset to the item.
-func (d *DB) remove(t *table, i int, hash *byte) int64 {
-	assert(i < t.size)
-
-	if hash != nil {
-		copyhash(hash, &t.items[i].hash[0])
-	}
-
-	offset := t.items[i].offset
-	lc := t.items[i].child
-	rc := t.items[i+1].child
-
-	if lc != 0 && rc != 0 {
-		/* replace the removed item by taking an item from one of the
-		   child tables */
-		var noff int64
-		if rand.Int()&1 != 0 {
-			noff = d.takeLargest(lc, &t.items[i].hash[0])
-			t.items[i].child = collapse(d, lc)
-		} else {
-			noff = d.takeSmallest(rc, &t.items[i].hash[0])
-			t.items[i+1].child = collapse(d, rc)
-		}
-		t.items[i].child = noff
-	} else {
-		// memmove(&table->items[i], &table->items[i + 1],
-		//	(table->size - i) * sizeof(struct btree_item));
-		copy(t.items[i:], t.items[i+1:])
-		t.size--
-
-		if lc != 0 {
-			t.items[i].child = lc
-		} else {
-			t.items[i].child = rc
-		}
-	}
-	return offset
-}
-
-func (d *DB) insert(toff int64, hash *byte, data []byte, size int) int64 {
-	table := d.get(toff)
-	assert(table.size < tableSize-1)
-
-	left, right := 0, table.size
-	for left < right {
-		mid := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[mid].hash[0]); {
-		case cmp == 0:
-			// already in the table
-			ret := table.items[mid].offset
-			d.put(table, toff)
-			return ret
-		case cmp < 0:
-			right = mid
-		default:
-			left = mid + 1
-		}
-	}
-	i := left
-
-	var off, rc, ret int64
-	lc := table.items[i].child
-	if lc != 0 {
-		/* recursion */
-		ret = d.insert(lc, hash, data, size)
-
-		/* check if we need to split */
-		child := d.get(lc)
-		if child.size < tableSize-1 {
-			/* nothing to do */
-			d.put(table, toff)
-			d.put(child, lc)
-			return ret
-		}
-		/* overwrites SHA-1 */
-		rc = d.split(child, hash, &off)
-		/* flush just in case changes happened */
-		d.flush(child, lc)
-
-		// make sure data is written before a reference is added to it
-		_ = d.fd.Sync()
-	} else {
-		off = d.insertData(data, size)
-		ret = off
-	}
-
-	table.size++
-	// memmove(&table->items[i + 1], &table->items[i],
-	//  (table->size - i) * sizeof(struct btree_item));
-	copy(table.items[i+1:], table.items[i:])
-	copyhash(&table.items[i].hash[0], hash)
-	table.items[i].offset = off
-	table.items[i].child = lc
-	table.items[i+1].child = rc
-
-	d.flush(table, toff)
-	return ret
-}
-
-func (d *DB) insertData(data []byte, size int) int64 {
-	if data == nil {
-		return int64(size)
-	}
-	assert(len(data) == size)
-
-	offset := d.allocChunk(4 + len(data))
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := write32(d.fd, int32(len(data)))
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	_, err = d.fd.Write(data)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return offset
-}
-
-// delete remove an item with key 'hash' from the given table. The offset to the
-// removed item is returned.
-// Please note that 'hash' is overwritten when called inside the allocator.
-func (d *DB) delete(offset int64, hash *byte) int64 {
-	if offset == 0 {
-		return 0
-	}
-	table := d.get(offset)
-
-	left, right := 0, table.size
-	for left < right {
-		i := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[i].hash[0]); {
-		case cmp == 0:
-			// found
-			ret := d.remove(table, i, hash)
-			d.flush(table, offset)
-			return ret
-		case cmp < 0:
-			right = i
-		default:
-			left = i + 1
-		}
-	}
-
-	// not found - recursion
-	i := left
-	child := table.items[i].child
-	ret := d.delete(child, hash)
-	if ret != 0 {
-		table.items[i].child = collapse(d, child)
-	}
-
-	if ret == 0 && d.deleteLarger && i < table.size {
-		ret = d.remove(table, i, hash)
-	}
-	if ret != 0 {
-		/* flush just in case changes happened */
-		d.flush(table, offset)
-	} else {
-		d.put(table, offset)
-	}
-	return ret
-}
-
-func (d *DB) insertTopLevel(toff *int64, hash *byte, data []byte, size int) int64 { // nolint:unparam
-	var off, ret, rc int64
-	if *toff != 0 {
-		ret = d.insert(*toff, hash, data, size)
-
-		/* check if we need to split */
-		table := d.get(*toff)
-		if table.size < tableSize-1 {
-			/* nothing to do */
-			d.put(table, *toff)
-			return ret
-		}
-		rc = d.split(table, hash, &off)
-		d.flush(table, *toff)
-	} else {
-		off = d.insertData(data, size)
-		ret = off
-	}
-
-	/* create new top level table */
-	t := new(table)
-	t.size = 1
-	copyhash(&t.items[0].hash[0], hash)
-	t.items[0].offset = off
-	t.items[0].child = *toff
-	t.items[1].child = rc
-
-	ntoff := d.allocChunk(tableStructSize)
-	d.flush(t, ntoff)
-
-	*toff = ntoff
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return ret
-}
-
-func (d *DB) lookup(toff int64, hash *byte) int64 {
-	if toff == 0 {
-		return 0
-	}
-	table := d.get(toff)
-
-	left, right := 0, table.size
-	for left < right {
-		mid := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[mid].hash[0]); {
-		case cmp == 0:
-			// found
-			ret := table.items[mid].offset
-			d.put(table, toff)
-			return ret
-		case cmp < 0:
-			right = mid
-		default:
-			left = mid + 1
-		}
-	}
-
-	i := left
-	child := table.items[i].child
-	d.put(table, toff)
-	return d.lookup(child, hash)
-}
-
-// Insert a new item with key 'hash' with the contents in 'data' to the
-// database file.
-func (d *DB) Insert(chash *byte, data []byte) {
-	/* SHA-1 must be in writable memory */
-	var hash [hashSize]byte
-	copyhash(&hash[0], chash)
-
-	_ = d.insertTopLevel(&d.top, &hash[0], data, len(data))
-	freeQueued(d)
-	d.flushSuper()
-}
-
-func (d *DB) readValue(off int64) []byte {
-	d.fd.Seek(off, io.SeekStart)
-	length, err := read32(d.fd)
-	if err != nil {
-		return nil
-	}
-	data := make([]byte, length)
-	n, err := io.ReadFull(d.fd, data)
-	if err != nil {
-		return nil
-	}
-	return data[:n]
-}
-
-// Get look up item with the given key 'hash' in the database file. Length of the
-// item is stored in 'len'. Returns a pointer to the contents of the item.
-// The returned pointer should be released with free() after use.
-func (d *DB) Get(hash *byte) []byte {
-	off := d.lookup(d.top, hash)
-	if off == 0 {
-		return nil
-	}
-	return d.readValue(off)
-}
-
-// Delete remove item with the given key 'hash' from the database file.
-func (d *DB) Delete(hash *byte) error {
-	var h [hashSize]byte
-	copyhash(&h[0], hash)
-
-	off := d.delete(d.top, &h[0])
-	if off == 0 {
-		return nil // not found key
-	}
-
-	d.top = collapse(d, d.top)
-	freeQueued(d)
-	d.flushSuper()
-
-	d.fd.Seek(off, io.SeekStart)
-	length, err := read32(d.fd) // len: 0
-	if err != nil {
-		return errors.Wrap(err, "btree I/O error")
-	}
-
-	d.freeChunk(off, int(length+4))
-	freeQueued(d)
-	d.flushSuper()
-	return nil
-}
-
-// Foreach iterates over all items in the database file.
-func (d *DB) Foreach(iter func(key [16]byte, value []byte)) {
-	if d.top != 0 {
-		top := d.get(d.top)
-		d.iterate(top, iter)
-	}
-}
-
-func (d *DB) iterate(table *table, iter func(key [16]byte, value []byte)) {
-	for i := 0; i < table.size; i++ {
-		item := table.items[i]
-		offset := item.offset
-		iter(item.hash, d.readValue(offset))
-
-		if item.child != 0 {
-			child := d.get(item.child)
-			d.iterate(child, iter)
-		}
-	}
-	item := table.items[table.size]
-	if item.child != 0 {
-		child := d.get(item.child)
-		d.iterate(child, iter)
-	}
-}

internal/btree/btree_test.go

@@ -1,97 +0,0 @@
-package btree
-
-import (
-	"crypto/sha1"
-	"os"
-	"testing"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	assert2 "github.com/stretchr/testify/assert"
-)
-
-func tempfile(t *testing.T) string {
-	temp, err := os.CreateTemp(".", "temp.*.db")
-	assert2.NoError(t, temp.Close())
-	assert2.NoError(t, err)
-	return temp.Name()
-}
-
-func TestCreate(t *testing.T) {
-	f := tempfile(t)
-	_, err := Create(f)
-	assert2.NoError(t, err)
-	defer os.Remove(f)
-}
-
-func TestBtree(t *testing.T) {
-	f := tempfile(t)
-	defer os.Remove(f)
-	bt, err := Create(f)
-	assert := assert2.New(t)
-	assert.NoError(err)
-
-	tests := []string{
-		"hello world",
-		"123",
-		"We are met on a great battle-field of that war.",
-		"Abraham Lincoln, November 19, 1863, Gettysburg, Pennsylvania",
-	}
-	sha := make([]*byte, len(tests))
-	for i, tt := range tests {
-		hash := sha1.New()
-		hash.Write([]byte(tt))
-		sha[i] = &hash.Sum(nil)[0]
-		bt.Insert(sha[i], []byte(tt))
-	}
-	assert.NoError(bt.Close())
-
-	bt, err = Open(f)
-	assert.NoError(err)
-	var ss []string
-	bt.Foreach(func(key [16]byte, value []byte) {
-		ss = append(ss, string(value))
-	})
-	assert.ElementsMatch(tests, ss)
-
-	for i, tt := range tests {
-		assert.Equal([]byte(tt), bt.Get(sha[i]))
-	}
-
-	for i := range tests {
-		assert.NoError(bt.Delete(sha[i]))
-	}
-
-	for i := range tests {
-		assert.Equal([]byte(nil), bt.Get(sha[i]))
-	}
-	assert.NoError(bt.Close())
-}
-
-func testForeach(t *testing.T, elemSize int) {
-	expected := make([]string, elemSize)
-	for i := 0; i < elemSize; i++ {
-		expected[i] = utils.RandomString(20)
-	}
-	f := tempfile(t)
-	defer os.Remove(f)
-	bt, err := Create(f)
-	assert2.NoError(t, err)
-	for _, v := range expected {
-		hash := sha1.New()
-		hash.Write([]byte(v))
-		bt.Insert(&hash.Sum(nil)[0], []byte(v))
-	}
-	var got []string
-	bt.Foreach(func(key [16]byte, value []byte) {
-		got = append(got, string(value))
-	})
-	assert2.ElementsMatch(t, expected, got)
-	assert2.NoError(t, bt.Close())
-}
-
-func TestDB_Foreach(t *testing.T) {
-	elemSizes := []int{0, 5, 100, 200}
-	for _, size := range elemSizes {
-		testForeach(t, size)
-	}
-}

internal/btree/chunk.go

@@ -1,122 +0,0 @@
-package btree
-
-import (
-	"math/rand"
-	"unsafe"
-)
-
-type chunk struct {
-	offset int64
-	len    int
-}
-
-const freeQueueLen = 64
-
-func freeQueued(bt *DB) {
-	for i := 0; i < bt.fqueueLen; i++ {
-		chunk := &bt.fqueue[i]
-		bt.freeChunk(chunk.offset, chunk.len)
-	}
-	bt.fqueueLen = 0
-}
-
-func (d *DB) allocChunk(size int) int64 {
-	assert(size > 0)
-
-	size = power2(size)
-
-	var offset int64
-	if d.inAllocator {
-		const i32s = unsafe.Sizeof(int32(0))
-
-		/* create fake size SHA-1 */
-		var sha1 [hashSize]byte
-		p := unsafe.Pointer(&sha1[0])
-		*(*int32)(p) = -1                              // *(uint32_t *) hash = -1;
-		*(*uint32)(unsafe.Add(p, i32s)) = uint32(size) // ((__be32 *) hash)[1] = to_be32(size);
-
-		/* find free chunk with the larger or the same size/SHA-1 */
-		d.inAllocator = true
-		d.deleteLarger = true
-		offset = d.delete(d.freeTop, &sha1[0])
-		d.deleteLarger = false
-		if offset != 0 {
-			assert(*(*int32)(p) == -1)                   // assert(*(uint32_t *) hash == (uint32_t) -1)
-			flen := int(*(*uint32)(unsafe.Add(p, i32s))) // size_t free_len = from_be32(((__be32 *) hash)[1])
-			assert(power2(flen) == flen)
-			assert(flen >= size)
-
-			/* delete buddy information */
-			resethash(&sha1[0])
-			*(*int64)(p) = offset
-			buddyLen := d.delete(d.freeTop, &sha1[0])
-			assert(buddyLen == int64(size))
-
-			d.freeTop = collapse(d, d.freeTop)
-
-			d.inAllocator = false
-
-			/* free extra space at the end of the chunk */
-			for flen > size {
-				flen >>= 1
-				d.freeChunk(offset+int64(flen), flen)
-			}
-		} else {
-			d.inAllocator = false
-		}
-	}
-	if offset == 0 {
-		/* not found, allocate from the end of the file */
-		offset = d.alloc
-		/* TODO: this wastes memory.. */
-		if offset&int64(size-1) != 0 {
-			offset += int64(size) - (offset & (int64(size) - 1))
-		}
-		d.alloc = offset + int64(size)
-	}
-	d.flushSuper()
-
-	// make sure the allocation tree is up-to-date before using the chunk
-	_ = d.fd.Sync()
-	return offset
-}
-
-/* Mark a chunk as unused in the database file */
-func (d *DB) freeChunk(offset int64, size int) {
-	assert(size > 0)
-	assert(offset != 0)
-	size = power2(size)
-	assert(offset&int64(size-1) == 0)
-
-	if d.inAllocator {
-		chunk := &d.fqueue[d.fqueueLen]
-		d.fqueueLen++
-		chunk.offset = offset
-		chunk.len = size
-		return
-	}
-
-	/* create fake offset SHA-1 for buddy allocation */
-	var sha1 [hashSize]byte
-	p := unsafe.Pointer(&sha1[0])
-	d.inAllocator = true
-
-	const i32s = unsafe.Sizeof(int32(0))
-
-	/* add buddy information */
-	resethash(&sha1[0])
-	*(*int32)(p) = -1                                 // *(uint32_t *) hash = -1;
-	*(*uint32)(unsafe.Add(p, i32s)) = uint32(size)    // ((__be32 *) hash)[1] = to_be32(size);
-	*(*uint32)(unsafe.Add(p, i32s*2)) = rand.Uint32() /* to make SHA-1 unique */
-	*(*uint32)(unsafe.Add(p, i32s*3)) = rand.Uint32()
-
-	// insert_toplevel(btree, &btree->free_top, hash, NULL, offset);
-	_ = d.insertTopLevel(&d.freeTop, &sha1[0], nil, int(offset))
-	d.inAllocator = false
-
-	d.flushSuper()
-
-	// make sure the allocation tree is up-to-date before removing
-	// references to the chunk
-	_ = d.fd.Sync()
-}

internal/btree/helper.go

@@ -1,106 +0,0 @@
-package btree
-
-import (
-	"io"
-	"reflect"
-	"unsafe"
-)
-
-func assert(cond bool) {
-	if !cond {
-		panic("assert failed!")
-	}
-}
-
-// power2 returns a value that is greater or equal to 'val' and is power-of-two.
-func power2(val int) int {
-	i := 1
-	for i < val {
-		i <<= 1
-	}
-	return i
-}
-
-// helpers for hash
-
-func cmp(a, b *byte) int64 {
-	pa, pb := unsafe.Pointer(a), unsafe.Pointer(b)
-	if *(*uint64)(pa) != *(*uint64)(pb) {
-		return int64(*(*uint64)(pa) - *(*uint64)(pb))
-	}
-	pa, pb = unsafe.Add(pa, 8), unsafe.Add(pb, 8)
-	return int64(*(*uint64)(pa) - *(*uint64)(pb))
-}
-
-func copyhash(dst *byte, src *byte) {
-	pa, pb := unsafe.Pointer(dst), unsafe.Pointer(src)
-	*(*[hashSize]byte)(pa) = *(*[hashSize]byte)(pb)
-}
-
-func resethash(sha1 *byte) {
-	p := unsafe.Pointer(sha1)
-	*(*[hashSize]byte)(p) = [hashSize]byte{}
-}
-
-// reading table
-
-func read32(r io.Reader) (int32, error) {
-	b := make([]byte, 4)
-	_, err := r.Read(b)
-	if err != nil {
-		return 0, err
-	}
-	return *(*int32)(unsafe.Pointer(&b[0])), nil
-}
-
-func readTable(r io.Reader, t *table) error {
-	buf := make([]byte, tableStructSize)
-	_, err := r.Read(buf)
-	if err != nil {
-		return err
-	}
-	*t = *(*table)(unsafe.Pointer(&buf[0]))
-	return nil
-}
-
-func readSuper(r io.Reader, s *super) error {
-	buf := make([]byte, superSize)
-	_, err := r.Read(buf)
-	if err != nil {
-		return err
-	}
-	*s = *(*super)(unsafe.Pointer(&buf[0]))
-	return nil
-}
-
-// write table
-
-func write32(w io.Writer, t int32) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(&t))
-	ph.Len = 4
-	ph.Cap = 4
-	_, err := w.Write(p)
-	return err
-}
-
-func writeTable(w io.Writer, t *table) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(t))
-	ph.Len = tableStructSize
-	ph.Cap = tableStructSize
-	_, err := w.Write(p)
-	return err
-}
-
-func writeSuper(w io.Writer, s *super) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(s))
-	ph.Len = superSize
-	ph.Cap = superSize
-	_, err := w.Write(p)
-	return err
-}

internal/cache/cache.go

@@ -2,14 +2,9 @@
 package cache
 
 import (
-	"fmt"
-	"sync"
-
 	log "github.com/sirupsen/logrus"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/internal/btree"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 // Media Cache DBs
@@ -21,70 +16,36 @@ var (
 
 // Cache wraps the btree.DB for concurrent safe
 type Cache struct {
-	lock sync.RWMutex
-	db   *btree.DB
+	ldb *leveldb.DB
 }
 
 // Insert 添加媒体缓存
 func (c *Cache) Insert(md5, data []byte) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	c.db.Insert(&hash[0], data)
+	_ = c.ldb.Put(md5, data, nil)
 }
 
 // Get 获取缓存信息
 func (c *Cache) Get(md5 []byte) []byte {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	return c.db.Get(&hash[0])
+	got, _ := c.ldb.Get(md5, nil)
+	return got
 }
 
 // Delete 删除指定缓存
 func (c *Cache) Delete(md5 []byte) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	_ = c.db.Delete(&hash[0])
+	_ = c.ldb.Delete(md5, nil)
 }
 
 // Init 初始化 Cache
 func Init() {
-	node, ok := base.Database["cache"]
-	var conf map[string]string
-	if ok {
-		err := node.Decode(&conf)
+	open := func(typ, path string, cache *Cache) {
+		ldb, err := leveldb.OpenFile(path, &opt.Options{
+			WriteBuffer: 4 * opt.KiB,
+		})
 		if err != nil {
-			log.Fatalf("failed to read cache config: %v", err)
+			log.Fatalf("open cache %s db failed: %v", typ, err)
 		}
+		cache.ldb = ldb
 	}
-
-	open := func(typ string, cache *Cache) {
-		file := conf[typ]
-		if file == "" {
-			file = fmt.Sprintf("data/%s.db", typ)
-		}
-		if global.PathExists(file) {
-			db, err := btree.Open(file)
-			if err != nil {
-				log.Fatalf("open %s cache failed: %v", typ, err)
-			}
-			cache.db = db
-		} else {
-			db, err := btree.Create(file)
-			if err != nil {
-				log.Fatalf("create %s cache failed: %v", typ, err)
-			}
-			cache.db = db
-		}
-	}
-	open("image", &Image)
-	open("video", &Video)
+	open("image", "data/images", &Image)
+	open("video", "data/videos", &Video)
 }

internal/download/download.go

@@ -0,0 +1,300 @@
+// Package download provide download utility functions
+package download
+
+import (
+	"bufio"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+
+	"github.com/pkg/errors"
+	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+)
+
+var client = &http.Client{
+	Transport: &http.Transport{
+		Proxy: func(request *http.Request) (u *url.URL, e error) {
+			if base.Proxy == "" {
+				return http.ProxyFromEnvironment(request)
+			}
+			return url.Parse(base.Proxy)
+		},
+		ForceAttemptHTTP2:   false,
+		MaxConnsPerHost:     0,
+		MaxIdleConns:        0,
+		MaxIdleConnsPerHost: 999,
+	},
+}
+
+// ErrOverSize 响应主体过大时返回此错误
+var ErrOverSize = errors.New("oversize")
+
+// UserAgent HTTP请求时使用的UA
+const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+
+// Request is a file download request
+type Request struct {
+	URL    string
+	Header map[string]string
+	Limit  int64
+}
+
+func (r Request) do() (*http.Response, error) {
+	req, err := http.NewRequest(http.MethodGet, r.URL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header["User-Agent"] = []string{UserAgent}
+	for k, v := range r.Header {
+		req.Header.Set(k, v)
+	}
+
+	return client.Do(req)
+}
+
+func (r Request) body() (io.ReadCloser, error) {
+	resp, err := r.do()
+	if err != nil {
+		return nil, err
+	}
+
+	limit := r.Limit // check file size limit
+	if limit > 0 && resp.ContentLength > limit {
+		_ = resp.Body.Close()
+		return nil, ErrOverSize
+	}
+
+	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
+		return gzipReadCloser(resp.Body)
+	}
+	return resp.Body, err
+}
+
+// Bytes 对给定URL发送Get请求，返回响应主体
+func (r Request) Bytes() ([]byte, error) {
+	rd, err := r.body()
+	if err != nil {
+		return nil, err
+	}
+	defer rd.Close()
+	return io.ReadAll(rd)
+}
+
+// JSON 发送GET请求， 并转换响应为JSON
+func (r Request) JSON() (gjson.Result, error) {
+	rd, err := r.body()
+	if err != nil {
+		return gjson.Result{}, err
+	}
+	defer rd.Close()
+
+	var sb strings.Builder
+	_, err = io.Copy(&sb, rd)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+
+	return gjson.Parse(sb.String()), nil
+}
+
+func writeToFile(reader io.ReadCloser, path string) error {
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o644)
+	if err != nil {
+		return err
+	}
+	_, err = file.ReadFrom(reader)
+	return err
+}
+
+// WriteToFile 下载到制定目录
+func (r Request) WriteToFile(path string) error {
+	rd, err := r.body()
+	if err != nil {
+		return err
+	}
+	defer rd.Close()
+	return writeToFile(rd, path)
+}
+
+// WriteToFileMultiThreading 多线程下载到制定目录
+func (r Request) WriteToFileMultiThreading(path string, thread int) error {
+	if thread < 2 {
+		return r.WriteToFile(path)
+	}
+
+	limit := r.Limit
+	type BlockMetaData struct {
+		BeginOffset    int64
+		EndOffset      int64
+		DownloadedSize int64
+	}
+	var blocks []*BlockMetaData
+	var contentLength int64
+	errUnsupportedMultiThreading := errors.New("unsupported multi-threading")
+	// 初始化分块或直接下载
+	initOrDownload := func() error {
+		header := make(map[string]string, len(r.Header))
+		for k, v := range r.Header { // copy headers
+			header[k] = v
+		}
+		header["range"] = "bytes=0-"
+		req := Request{
+			URL:    r.URL,
+			Header: header,
+		}
+		resp, err := req.do()
+		if err != nil {
+			return err
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		if resp.StatusCode == http.StatusOK {
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			if err = writeToFile(resp.Body, path); err != nil {
+				return err
+			}
+			return errUnsupportedMultiThreading
+		}
+		if resp.StatusCode == http.StatusPartialContent {
+			contentLength = resp.ContentLength
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			blockSize := contentLength
+			if contentLength > 1024*1024 {
+				blockSize = (contentLength / int64(thread)) - 10
+			}
+			if blockSize == contentLength {
+				return writeToFile(resp.Body, path)
+			}
+			var tmp int64
+			for tmp+blockSize < contentLength {
+				blocks = append(blocks, &BlockMetaData{
+					BeginOffset: tmp,
+					EndOffset:   tmp + blockSize - 1,
+				})
+				tmp += blockSize
+			}
+			blocks = append(blocks, &BlockMetaData{
+				BeginOffset: tmp,
+				EndOffset:   contentLength - 1,
+			})
+			return nil
+		}
+		return errors.New("unknown status code")
+	}
+	// 下载分块
+	downloadBlock := func(block *BlockMetaData) error {
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		_, _ = file.Seek(block.BeginOffset, io.SeekStart)
+		writer := bufio.NewWriter(file)
+		defer writer.Flush()
+
+		header := make(map[string]string, len(r.Header))
+		for k, v := range r.Header { // copy headers
+			header[k] = v
+		}
+		header["range"] = fmt.Sprintf("bytes=%d-%d", block.BeginOffset, block.EndOffset)
+		req := Request{
+			URL:    r.URL,
+			Header: header,
+		}
+		resp, err := req.do()
+		if err != nil {
+			return err
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		buffer := make([]byte, 1024)
+		i, err := resp.Body.Read(buffer)
+		for {
+			if err != nil && err != io.EOF {
+				return err
+			}
+			i64 := int64(len(buffer[:i]))
+			needSize := block.EndOffset + 1 - block.BeginOffset
+			if i64 > needSize {
+				i64 = needSize
+				err = io.EOF
+			}
+			_, e := writer.Write(buffer[:i64])
+			if e != nil {
+				return e
+			}
+			block.BeginOffset += i64
+			block.DownloadedSize += i64
+			if err == io.EOF || block.BeginOffset > block.EndOffset {
+				break
+			}
+			i, err = resp.Body.Read(buffer)
+		}
+		return nil
+	}
+
+	if err := initOrDownload(); err != nil {
+		if err == errUnsupportedMultiThreading {
+			return nil
+		}
+		return err
+	}
+	wg := sync.WaitGroup{}
+	wg.Add(len(blocks))
+	var lastErr error
+	for i := range blocks {
+		go func(b *BlockMetaData) {
+			defer wg.Done()
+			if err := downloadBlock(b); err != nil {
+				lastErr = err
+			}
+		}(blocks[i])
+	}
+	wg.Wait()
+	return lastErr
+}
+
+type gzipCloser struct {
+	f io.Closer
+	r *gzip.Reader
+}
+
+// gzipReadCloser 从 io.ReadCloser 创建 gunzip io.ReadCloser
+func gzipReadCloser(reader io.ReadCloser) (io.ReadCloser, error) {
+	gzipReader, err := gzip.NewReader(reader)
+	if err != nil {
+		return nil, err
+	}
+	return &gzipCloser{
+		f: reader,
+		r: gzipReader,
+	}, nil
+}
+
+// Read impls io.Reader
+func (g *gzipCloser) Read(p []byte) (n int, err error) {
+	return g.r.Read(p)
+}
+
+// Close impls io.Closer
+func (g *gzipCloser) Close() error {
+	_ = g.f.Close()
+	return g.r.Close()
+}

internal/mime/mime.go

@@ -0,0 +1,51 @@
+// Package mime 提供MIME检查功能
+package mime
+
+import (
+	"io"
+	"net/http"
+	"strings"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+)
+
+const limit = 4 * 1024
+
+func scan(r io.ReadSeeker) string {
+	_, _ = r.Seek(0, io.SeekStart)
+	defer r.Seek(0, io.SeekStart)
+	in := make([]byte, limit)
+	_, _ = r.Read(in)
+	return http.DetectContentType(in)
+}
+
+// CheckImage 判断给定流是否为合法图片
+// 返回 是否合法, 实际Mime
+// 判断后会自动将 Stream Seek 至 0
+func CheckImage(r io.ReadSeeker) (t string, ok bool) {
+	if base.SkipMimeScan {
+		return "", true
+	}
+	if r == nil {
+		return "image/nil-stream", false
+	}
+	t = scan(r)
+	switch t {
+	case "image/bmp", "image/gif", "image/jpeg", "image/png", "image/webp":
+		ok = true
+	}
+	return
+}
+
+// CheckAudio 判断给定流是否为合法音频
+func CheckAudio(r io.ReadSeeker) (string, bool) {
+	if base.SkipMimeScan {
+		return "", true
+	}
+	t := scan(r)
+	// std mime type detection is not full supported for audio
+	if strings.Contains(t, "text") || strings.Contains(t, "image") {
+		return t, false
+	}
+	return t, true
+}

internal/param/param.go

@@ -7,8 +7,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/segmentio/asm/base64"
 	"github.com/tidwall/gjson"
 )
 
@@ -30,7 +28,7 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 		if !j.Exists() {
 			return defaultVal
 		}
-		switch j.Type { // nolint
+		switch j.Type { // nolint: exhaustive
 		case gjson.True:
 			return true
 		case gjson.False:
@@ -83,13 +81,3 @@ 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
-}

internal/selfupdate/update.go

@@ -3,22 +3,22 @@ package selfupdate
 
 import (
 	"bufio"
+	"bytes"
 	"encoding/hex"
 	"fmt"
 	"hash"
 	"io"
+	"math"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
-	"github.com/dustin/go-humanize"
-	"github.com/kardianos/osext"
 	"github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 func readLine() (str string) {
@@ -29,11 +29,11 @@ func readLine() (str string) {
 }
 
 func lastVersion() (string, error) {
-	r, err := global.GetBytes("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest")
+	r, err := download.Request{URL: "https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest"}.JSON()
 	if err != nil {
 		return "", err
 	}
-	return gjson.GetBytes(r, "tag_name").Str, nil
+	return r.Get("tag_name").Str, nil
 }
 
 // CheckUpdate 检查更新
@@ -70,12 +70,12 @@ func binaryName() string {
 
 func checksum(github, version string) []byte {
 	sumURL := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp_checksums.txt", github, version)
-	closer, err := global.HTTPGetReadCloser(sumURL)
+	sum, err := download.Request{URL: sumURL}.Bytes()
 	if err != nil {
 		return nil
 	}
 
-	rd := bufio.NewReader(closer)
+	rd := bufio.NewReader(bytes.NewReader(sum))
 	for {
 		str, err := rd.ReadString('\n')
 		if err != nil {
@@ -147,13 +147,33 @@ func (wc *writeSumCounter) Write(p []byte) (int, error) {
 	wc.total += uint64(n)
 	wc.hash.Write(p)
 	fmt.Printf("\r                                    ")
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.total))
+	fmt.Printf("\rDownloading... %s complete", humanBytes(wc.total))
 	return n, nil
 }
 
+func logn(n, b float64) float64 {
+	return math.Log(n) / math.Log(b)
+}
+
+func humanBytes(s uint64) string {
+	sizes := []string{"B", "kB", "MB", "GB"} // GB对于go-cqhttp来说已经够用了
+	if s < 10 {
+		return fmt.Sprintf("%d B", s)
+	}
+	e := math.Floor(logn(float64(s), 1000))
+	suffix := sizes[int(e)]
+	val := math.Floor(float64(s)/math.Pow(1000, e)*10+0.5) / 10
+	f := "%.0f %s"
+	if val < 10 {
+		f = "%.1f %s"
+	}
+	return fmt.Sprintf(f, val, suffix)
+}
+
 // FromStream copy form getlantern/go-update
 func fromStream(updateWith io.Reader) (err error, errRecover error) {
-	updatePath, err := osext.Executable()
+	updatePath, err := os.Executable()
+	updatePath = filepath.Clean(updatePath)
 	if err != nil {
 		return
 	}
@@ -169,7 +189,7 @@ func fromStream(updateWith io.Reader) (err error, errRecover error) {
 	}
 	// We won't log this error, because it's always going to happen.
 	defer func() { _ = fp.Close() }()
-	if _, err = io.Copy(fp, bufio.NewReader(updateWith)); err != nil {
+	if _, err = bufio.NewReader(updateWith).WriteTo(fp); err != nil {
 		logrus.Errorf("Unable to copy data: %v\n", err)
 	}
 

internal/selfupdate/update_others.go

@@ -6,12 +6,11 @@ package selfupdate
 import (
 	"archive/tar"
 	"bytes"
+	"compress/gzip"
 	"crypto/sha256"
 	"errors"
 	"io"
 	"net/http"
-
-	"github.com/klauspost/compress/gzip"
 )
 
 // update go-cqhttp自我更新

internal/selfupdate/update_windows.go

@@ -1,13 +1,12 @@
 package selfupdate
 
 import (
+	"archive/zip"
 	"bytes"
 	"crypto/sha256"
 	"errors"
 	"io"
 	"net/http"
-
-	"github.com/klauspost/compress/zip"
 )
 
 // update go-cqhttp自我更新

main.go

@@ -1,12 +1,15 @@
+// Package main
 package main
 
 import (
 	"github.com/Mrs4s/go-cqhttp/cmd/gocq"
 
-	_ "github.com/Mrs4s/go-cqhttp/db/leveldb"    // leveldb
-	_ "github.com/Mrs4s/go-cqhttp/modules/mime"  // mime检查模块
-	_ "github.com/Mrs4s/go-cqhttp/modules/pprof" // pprof 性能分析
+	_ "github.com/Mrs4s/go-cqhttp/db/leveldb"   // leveldb 数据库支持
 	_ "github.com/Mrs4s/go-cqhttp/modules/silk" // silk编码模块
+	// 其他模块
+	// _ "github.com/Mrs4s/go-cqhttp/db/sqlite3"   // sqlite3 数据库支持
+	// _ "github.com/Mrs4s/go-cqhttp/db/mongodb"    // mongodb 数据库支持
+	// _ "github.com/Mrs4s/go-cqhttp/modules/pprof" // pprof 性能分析
 )
 
 func main() {

modules/api/api.go

@@ -21,12 +21,16 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 	case ".ocr_image", "ocr_image":
 		p0 := p.Get("image").String()
 		return c.bot.CQOcrImage(p0)
+	case "_del_group_notice":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("notice_id").String()
+		return c.bot.CQDelGroupMemo(p0, p1)
+	case "_get_group_notice":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetGroupMemo(p0)
 	case "_get_model_show":
 		p0 := p.Get("model").String()
 		return c.bot.CQGetModelShow(p0)
-	case "_get_vip_info":
-		p0 := p.Get("user_id").Int()
-		return c.bot.CQGetVipInfo(p0)
 	case "_send_group_notice":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("content").String()
@@ -195,6 +199,12 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 	case "reload_event_filter":
 		p0 := p.Get("file").String()
 		return c.bot.CQReloadEventFilter(p0)
+	case "send_forward_msg":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("messages")
+		p3 := p.Get("message_type").String()
+		return c.bot.CQSendForwardMessage(p0, p1, p2, p3)
 	case "send_group_forward_msg":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("messages")
@@ -204,6 +214,9 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 		p1 := p.Get("message")
 		p2 := p.Get("auto_escape").Bool()
 		return c.bot.CQSendGroupMessage(p0, p1, p2)
+	case "send_group_sign":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQSendGroupSign(p0)
 	case "send_guild_channel_msg":
 		p0 := p.Get("guild_id").Uint()
 		p1 := p.Get("channel_id").Uint()
@@ -217,6 +230,10 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 		p3 := p.Get("message_type").String()
 		p4 := p.Get("auto_escape").Bool()
 		return c.bot.CQSendMessage(p0, p1, p2, p3, p4)
+	case "send_private_forward_msg":
+		p0 := p.Get("user_id").Int()
+		p1 := p.Get("messages")
+		return c.bot.CQSendPrivateForwardMessage(p0, p1)
 	case "send_private_msg":
 		p0 := p.Get("user_id").Int()
 		p1 := p.Get("group_id").Int()
@@ -304,6 +321,13 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 		p2 := p.Get("role_id").Uint()
 		p3 := p.Get("users")
 		return c.bot.CQSetGuildMemberRole(p0, p1, p2, p3)
+	case "set_qq_profile":
+		p0 := p.Get("nickname")
+		p1 := p.Get("company")
+		p2 := p.Get("email")
+		p3 := p.Get("college")
+		p4 := p.Get("personal_note")
+		return c.bot.CQSetQQProfile(p0, p1, p2, p3, p4)
 	case "update_guild_role":
 		p0 := p.Get("guild_id").Uint()
 		p1 := p.Get("role_id").Uint()
@@ -317,5 +341,10 @@ func (c *Caller) call(action string, p Getter) global.MSG {
 		p2 := p.Get("name").String()
 		p3 := p.Get("folder").String()
 		return c.bot.CQUploadGroupFile(p0, p1, p2, p3)
+	case "upload_private_file":
+		p0 := p.Get("user_id").Int()
+		p1 := p.Get("file").String()
+		p2 := p.Get("name").String()
+		return c.bot.CQUploadPrivateFile(p0, p1, p2)
 	}
 }

modules/config/config.go

@@ -8,13 +8,13 @@ import (
 	"os"
 	"regexp"
 	"strings"
-	"sync"
 
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 )
 
 // defaultConfig 默认配置文件
+//
 //go:embed default_config.yml
 var defaultConfig string
 
@@ -75,18 +75,6 @@ type Server struct {
 	Default string
 }
 
-// LevelDBConfig leveldb 相关配置
-type LevelDBConfig struct {
-	Enable bool `yaml:"enable"`
-}
-
-// MongoDBConfig mongodb 相关配置
-type MongoDBConfig struct {
-	Enable   bool   `yaml:"enable"`
-	URI      string `yaml:"uri"`
-	Database string `yaml:"database"`
-}
-
 // Parse 从默认配置文件路径中获取
 func Parse(path string) *Config {
 	file, err := os.ReadFile(path)
@@ -103,16 +91,11 @@ func Parse(path string) *Config {
 	return config
 }
 
-var (
-	serverconfs []*Server
-	mu          sync.Mutex
-)
+var serverconfs []*Server
 
 // AddServer 添加该服务的简介和默认配置
 func AddServer(s *Server) {
-	mu.Lock()
 	serverconfs = append(serverconfs, s)
-	mu.Unlock()
 }
 
 // generateConfig 生成配置文件
@@ -155,8 +138,7 @@ func expand(s string, mapping func(string) string) string {
 	r := regexp.MustCompile(`\${([a-zA-Z_]+[a-zA-Z0-9_:/.]*)}`)
 	return r.ReplaceAllStringFunc(s, func(s string) string {
 		s = strings.Trim(s, "${}")
-		// todo: use strings.Cut once go1.18 is released
-		before, after, ok := cut(s, ":")
+		before, after, ok := strings.Cut(s, ":")
 		m := mapping(before)
 		if ok && m == "" {
 			return after
@@ -164,10 +146,3 @@ func expand(s string, mapping func(string) string) string {
 		return m
 	})
 }
-
-func cut(s, sep string) (before, after string, found bool) {
-	if i := strings.Index(s, sep); i >= 0 {
-		return s[:i], s[i+len(sep):], true
-	}
-	return s, "", false
-}

modules/config/default_config.yml

@@ -78,11 +78,12 @@ database: # 数据库相关设置
     # 启用将会增加10-20MB的内存占用和一定的磁盘空间
     # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
     enable: true
-
-  # 媒体文件缓存， 删除此项则使用缓存文件(旧版行为)
-  cache:
-    image: data/image.db
-    video: data/video.db
+  sqlite3:
+    # 是否启用内置sqlite3数据库
+    # 启用将会增加一定的内存占用和一定的磁盘空间
+    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable: false
+    cachettl: 3600000000000 # 1h
 
 # 连接服务列表
 servers:

modules/mime/mime.go

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

modules/servers/servers.go

@@ -43,4 +43,5 @@ func Run(bot *coolq.CQBot) {
 	for _, fn := range nocfgsvr {
 		go fn(bot)
 	}
+	base.Servers = nil
 }

server/daemon.go

@@ -3,9 +3,10 @@ package server
 // daemon 功能写在这，目前仅支持了-d 作为后台运行参数，stop，start，restart这些功能目前看起来并不需要，可以通过api控制，后续需要的话再补全。
 
 import (
-	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"strconv"
 	"strings"
 
 	"github.com/Mrs4s/go-cqhttp/global"
@@ -28,7 +29,9 @@ func Daemon() {
 		execArgs = append(execArgs, args[i])
 	}
 
-	proc := exec.Command(os.Args[0], execArgs...)
+	ex, _ := os.Executable()
+	p, _ := filepath.Abs(ex)
+	proc := exec.Command(p, execArgs...)
 	err := proc.Start()
 	if err != nil {
 		panic(err)
@@ -36,7 +39,7 @@ func Daemon() {
 
 	log.Info("[PID] ", proc.Process.Pid)
 	// pid写入到pid文件中，方便后续stop的时候kill
-	pidErr := savePid("go-cqhttp.pid", fmt.Sprintf("%d", proc.Process.Pid))
+	pidErr := savePid("go-cqhttp.pid", strconv.FormatInt(int64(proc.Process.Pid), 10))
 	if pidErr != nil {
 		log.Errorf("save pid file error: %v", pidErr)
 	}

server/http.go

@@ -2,12 +2,15 @@ package server
 
 import (
 	"bytes"
+	"context"
 	"crypto/hmac"
 	"crypto/sha1"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -31,6 +34,7 @@ import (
 // HTTPServer HTTP通信相关配置
 type HTTPServer struct {
 	Disabled    bool   `yaml:"disabled"`
+	Address     string `yaml:"address"`
 	Host        string `yaml:"host"`
 	Port        int    `yaml:"port"`
 	Timeout     int32  `yaml:"timeout"`
@@ -51,7 +55,6 @@ type httpServerPost struct {
 }
 
 type httpServer struct {
-	HTTP        *http.Server
 	api         *api.Caller
 	accessToken string
 }
@@ -64,6 +67,7 @@ type HTTPClient struct {
 	filter          string
 	apiPort         int
 	timeout         int32
+	client          *http.Client
 	MaxRetries      uint64
 	RetriesInterval uint64
 }
@@ -76,8 +80,7 @@ type httpCtx struct {
 
 const httpDefault = `
   - http: # HTTP 通信设置
-      host: 127.0.0.1 # 服务端监听地址
-      port: 5700      # 服务端监听端口
+      address: 0.0.0.0:5700 # HTTP监听地址
       timeout: 5      # 反向 HTTP 超时时间, 单位秒，<5 时将被忽略
       long-polling:   # 长轮询拓展
         enabled: false       # 是否开启
@@ -209,9 +212,9 @@ func checkAuth(req *http.Request, token string) int {
 	if auth == "" {
 		auth = req.URL.Query().Get("access_token")
 	} else {
-		authN := strings.SplitN(auth, " ", 2)
-		if len(authN) == 2 {
-			auth = authN[1]
+		_, after, ok := strings.Cut(auth, " ")
+		if ok {
+			auth = after
 		}
 	}
 
@@ -243,12 +246,21 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
 		return
 	}
 
-	var addr string
+	network, addr := "tcp", conf.Address
 	s := &httpServer{accessToken: conf.AccessToken}
-	if conf.Host == "" || conf.Port == 0 {
+	switch {
+	case conf.Address != "":
+		uri, err := url.Parse(conf.Address)
+		if err == nil && uri.Scheme != "" {
+			network = uri.Scheme
+			addr = uri.Host + uri.Path
+		}
+	case conf.Host != "" || conf.Port != 0:
+		addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+		log.Warnln("HTTP 服务器使用了过时的配置格式，请更新配置文件！")
+	default:
 		goto client
 	}
-	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
 	s.api = api.NewCaller(bot)
 	if conf.RateLimit.Enabled {
 		s.api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
@@ -256,20 +268,16 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
 	if conf.LongPolling.Enabled {
 		s.api.Use(longPolling(bot, conf.LongPolling.MaxQueueSize))
 	}
-
 	go func() {
-		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		s.HTTP = &http.Server{
-			Addr:    addr,
-			Handler: s,
-		}
-		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Error(err)
-			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
+		listener, err := net.Listen(network, addr)
+		if err != nil {
+			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用: %v", err)
 			log.Warnf("将在五秒后退出.")
 			time.Sleep(time.Second * 5)
 			os.Exit(1)
 		}
+		log.Infof("CQ HTTP 服务器已启动: %v", listener.Addr())
+		log.Fatal(http.Serve(listener, s))
 	}()
 client:
 	for _, c := range conf.Post {
@@ -294,8 +302,30 @@ func (c HTTPClient) Run() {
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
+	rawAddress := c.addr
+	network, address := resolveURI(c.addr)
+	client := &http.Client{
+		Timeout: time.Second * time.Duration(c.timeout),
+		Transport: &http.Transport{
+			DialContext: func(_ context.Context, _, addr string) (net.Conn, error) {
+				if network == "unix" {
+					host, _, err := net.SplitHostPort(addr)
+					if err != nil {
+						host = addr
+					}
+					filepath, err := base64.RawURLEncoding.DecodeString(host)
+					if err == nil {
+						addr = string(filepath)
+					}
+				}
+				return net.Dial(network, addr)
+			},
+		},
+	}
+	c.addr = address // clean path
+	c.client = client
+	log.Infof("HTTP POST上报器已启动: %v", rawAddress)
 	c.bot.OnEventPush(c.onBotPushEvent)
-	log.Infof("HTTP POST上报器已启动: %v", c.addr)
 }
 
 func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
@@ -307,7 +337,6 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 		}
 	}
 
-	client := http.Client{Timeout: time.Second * time.Duration(c.timeout)}
 	header := make(http.Header)
 	header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
 	header.Set("User-Agent", "CQHttp/4.15.0")
@@ -321,36 +350,33 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 		header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
 	}
 
+	var req *http.Request
 	var res *http.Response
+	var err error
 	for i := uint64(0); i <= c.MaxRetries; i++ {
 		// see https://stackoverflow.com/questions/31337891/net-http-http-contentlength-222-with-body-length-0
 		// we should create a new request for every single post trial
-		req, err := http.NewRequest("POST", c.addr, bytes.NewReader(e.JSONBytes()))
+		req, err = http.NewRequest(http.MethodPost, c.addr, bytes.NewReader(e.JSONBytes()))
 		if err != nil {
 			log.Warnf("上报 Event 数据到 %v 时创建请求失败: %v", c.addr, err)
 			return
 		}
 		req.Header = header
-
-		res, err = client.Do(req)
-		if res != nil {
-			//goland:noinspection GoDeferInLoop
-			defer res.Body.Close()
-		}
+		res, err = c.client.Do(req) // nolint:bodyclose
 		if err == nil {
 			break
 		}
 		if i < c.MaxRetries {
 			log.Warnf("上报 Event 数据到 %v 失败: %v 将进行第 %d 次重试", c.addr, err, i+1)
 		} else {
-			log.Warnf("上报 Event 数据 %s 到 %v 失败: %v 停止上报：已达重试上线", e.JSONBytes(), c.addr, err)
+			log.Warnf("上报 Event 数据 %s 到 %v 失败: %v 停止上报：已达重试上限", e.JSONBytes(), c.addr, err)
 			return
 		}
 		time.Sleep(time.Millisecond * time.Duration(c.RetriesInterval))
 	}
+	defer res.Body.Close()
 
 	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
-
 	r, err := io.ReadAll(res.Body)
 	if err != nil {
 		return

server/middlewares.go

@@ -39,7 +39,7 @@ func longPolling(bot *coolq.CQBot, maxSize int) api.Handler {
 	bot.OnEventPush(func(event *coolq.Event) {
 		mutex.Lock()
 		defer mutex.Unlock()
-		queue.PushBack(event.RawMsg)
+		queue.PushBack(event.Raw)
 		for maxSize != 0 && queue.Len() > maxSize {
 			queue.Remove(queue.Front())
 		}
@@ -50,33 +50,37 @@ func longPolling(bot *coolq.CQBot, maxSize int) api.Handler {
 			return nil
 		}
 		var (
-			once    sync.Once
-			ch      = make(chan []interface{}, 1)
+			ch      = make(chan []interface{})
 			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
 		)
-		defer close(ch)
 		go func() {
 			mutex.Lock()
 			defer mutex.Unlock()
-			if queue.Len() == 0 {
+			for queue.Len() == 0 {
 				cond.Wait()
 			}
-			once.Do(func() {
 			limit := int(p.Get("limit").Int())
 			if limit <= 0 || queue.Len() < limit {
 				limit = queue.Len()
 			}
 			ret := make([]interface{}, limit)
+			elem := queue.Front()
 			for i := 0; i < limit; i++ {
-					ret[i] = queue.Remove(queue.Front())
+				ret[i] = elem.Value
+				elem = elem.Next()
+			}
+			select {
+			case ch <- ret:
+				for i := 0; i < limit; i++ { // remove sent msg
+					queue.Remove(queue.Front())
+				}
+			default:
+				// don't block if parent already return due to timeout
 			}
-				ch <- ret
-			})
 		}()
 		if timeout != 0 {
 			select {
 			case <-time.After(timeout):
-				once.Do(func() {})
 				return coolq.OK([]interface{}{})
 			case ret := <-ch:
 				return coolq.OK(ret)

server/scf.go

@@ -54,7 +54,7 @@ func (l *lambdaResponseWriter) flush() error {
 	buffer := global.NewBuffer()
 	defer global.PutBuffer(buffer)
 	body := utils.B2S(l.buf.Bytes())
-	header := make(map[string]string)
+	header := make(map[string]string, len(l.header))
 	for k, v := range l.header {
 		header[k] = v[0]
 	}
@@ -65,7 +65,7 @@ func (l *lambdaResponseWriter) flush() error {
 		Body:            body,
 	})
 
-	r, _ := http.NewRequest("POST", cli.responseURL, buffer)
+	r, _ := http.NewRequest(http.MethodPost, cli.responseURL, buffer)
 	do, err := cli.client.Do(r)
 	if err != nil {
 		return err
@@ -190,9 +190,9 @@ func (c *lambdaClient) next() *http.Request {
 	if resp.StatusCode != http.StatusOK {
 		return nil
 	}
-	req := new(http.Request)
-	invoke := new(lambdaInvoke)
-	_ = json.NewDecoder(resp.Body).Decode(invoke)
+	var req http.Request
+	var invoke lambdaInvoke
+	_ = json.NewDecoder(resp.Body).Decode(&invoke)
 	if invoke.HTTPMethod == "" { // 不是 api 网关
 		return nil
 	}
@@ -211,5 +211,5 @@ func (c *lambdaClient) next() *http.Request {
 		query[k] = []string{v}
 	}
 	req.URL.RawQuery = query.Encode()
-	return req
+	return &req
 }

server/websocket.go

@@ -2,9 +2,12 @@ package server
 
 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"net"
 	"net/http"
+	"net/url"
 	"runtime/debug"
 	"strconv"
 	"strings"
@@ -75,9 +78,7 @@ var upgrader = websocket.Upgrader{
 const wsDefault = `  # 正向WS设置
   - ws:
       # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
+      address: 0.0.0.0:8080
       middlewares:
         <<: *default # 引用默认中间件
 `
@@ -100,6 +101,7 @@ const wsReverseDefault = `  # 反向WS设置
 // WebsocketServer 正向WS相关配置
 type WebsocketServer struct {
 	Disabled bool   `yaml:"disabled"`
+	Address  string `yaml:"address"`
 	Host     string `yaml:"host"`
 	Port     int    `yaml:"port"`
 
@@ -139,6 +141,17 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 		return
 	}
 
+	network, address := "tcp", conf.Address
+	if conf.Address == "" && (conf.Host != "" || conf.Port != 0) {
+		log.Warn("正向 Websocket 使用了过时的配置格式，请更新配置文件")
+		address = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	} else {
+		uri, err := url.Parse(conf.Address)
+		if err == nil && uri.Scheme != "" {
+			network = uri.Scheme
+			address = uri.Host + uri.Path
+		}
+	}
 	s := &webSocketServer{
 		bot:    b,
 		conf:   &conf,
@@ -146,7 +159,6 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 		filter: conf.Filter,
 	}
 	filter.Add(s.filter)
-	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
 	s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
 		b.Client.Uin, time.Now().Unix())
 	b.OnEventPush(s.onBotPushEvent)
@@ -154,8 +166,12 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 	mux.HandleFunc("/event", s.event)
 	mux.HandleFunc("/api", s.api)
 	mux.HandleFunc("/", s.any)
-	log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-	log.Fatal(http.ListenAndServe(addr, &mux))
+	listener, err := net.Listen(network, address)
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Infof("CQ WebSocket 服务器已启动: %v", listener.Addr())
+	log.Fatal(http.Serve(listener, &mux))
 }
 
 // runWSClient 运行一个反向向WS client
@@ -196,8 +212,26 @@ func runWSClient(b *coolq.CQBot, node yaml.Node) {
 	}
 }
 
-func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
-	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, url)
+func resolveURI(addr string) (network, address string) {
+	network, address = "tcp", addr
+	uri, err := url.Parse(addr)
+	if err == nil && uri.Scheme != "" {
+		scheme, ext, _ := strings.Cut(uri.Scheme, "+")
+		if ext != "" {
+			network = ext
+			uri.Scheme = scheme // remove `+unix`/`+tcp4`
+			if ext == "unix" {
+				uri.Host, uri.Path, _ = strings.Cut(uri.Path, ":")
+				uri.Host = base64.StdEncoding.EncodeToString([]byte(uri.Host))
+			}
+			address = uri.String()
+		}
+	}
+	return
+}
+
+func (c *websocketClient) connect(typ, addr string, conptr **wsConn) {
+	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, addr)
 	header := http.Header{
 		"X-Client-Role": []string{typ},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -206,12 +240,30 @@ func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(url, header) // nolint
+
+	network, address := resolveURI(addr)
+	dialer := websocket.Dialer{
+		NetDial: func(_, addr string) (net.Conn, error) {
+			if network == "unix" {
+				host, _, err := net.SplitHostPort(addr)
 				if err != nil {
-		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, url, err)
+					host = addr
+				}
+				filepath, err := base64.RawURLEncoding.DecodeString(host)
+				if err == nil {
+					addr = string(filepath)
+				}
+			}
+			return net.Dial(network, addr) // support unix socket transport
+		},
+	}
+
+	conn, _, err := dialer.Dial(address, header) // nolint
+	if err != nil {
+		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, addr, err)
 		if c.reconnectInterval != 0 {
 			time.Sleep(c.reconnectInterval)
-			c.connect(typ, url, conptr)
+			c.connect(typ, addr, conptr)
 		}
 		return
 	}
@@ -225,7 +277,7 @@ func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
 		}
 	}
 
-	log.Infof("已连接到反向WebSocket %s服务器 %v", typ, url)
+	log.Infof("已连接到反向WebSocket %s服务器 %v", typ, addr)
 
 	var wrappedConn *wsConn
 	if conptr != nil && *conptr != nil {
@@ -244,7 +296,7 @@ func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
 	}
 
 	if typ != "Event" {
-		go c.listenAPI(typ, url, wrappedConn)
+		go c.listenAPI(typ, addr, wrappedConn)
 	}
 }