Merge branch 'dev' into database-support

# Conflicts:
#	main.go

.github/ISSUE_TEMPLATE/bug--.md

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

.github/workflows/ci.yml

@@ -22,15 +22,13 @@ jobs:
             goarch: arm
           - goos: darwin
             goarch: "386"
-          - goos: windows
-            goarch: arm64
       fail-fast: true
     steps:
       - uses: actions/checkout@v2
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.16
+          go-version: 1.17
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:

.github/workflows/golint.yml

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

.github/workflows/release.yml

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

.golangci.yml

@@ -78,7 +78,9 @@ run:
   # concurrency: 4 # explicitly omit this value to fully utilize available resources.
   deadline: 5m
   issues-exit-code: 1
-  tests: false
+  skip-dirs:
+    - db
+  tests: true
 
 # output configuration options
 output:
@@ -92,4 +94,4 @@ issues:
   fix: true
   exclude-use-default: false
   exclude:
-    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
+    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"

.goreleaser.yml

@@ -27,7 +27,7 @@ builds:
     flags:
       - -trimpath
     ldflags:
-      - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
+      - -s -w -X github.com/Mrs4s/go-cqhttp/internal/base.Version=v{{.Version}}
   - id: win
     env:
       - CGO_ENABLED=0
@@ -38,6 +38,7 @@ builds:
       - 386
       - amd64
       - arm
+      - arm64
     goarm:
       - 7
     mod_timestamp: "{{ .CommitTimestamp }}"

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine AS builder
+FROM golang:1.17-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
@@ -14,6 +14,8 @@ RUN set -ex \
 
 FROM alpine:latest
 
+RUN apk add --no-cache ffmpeg
+
 COPY --from=builder /build/cqhttp /usr/bin/cqhttp
 RUN chmod +x /usr/bin/cqhttp
 

coolq/bot.go

@@ -2,10 +2,9 @@ package coolq
 
 import (
 	"bytes"
-	"encoding/gob"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
-	"hash/crc32"
 	"io"
 	"os"
 	"path"
@@ -13,24 +12,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gabriel-vasile/mimetype"
+	"github.com/Mrs4s/go-cqhttp/db"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
-	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
 
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 // CQBot CQBot结构体,存储Bot实例相关配置
 type CQBot struct {
 	Client *client.QQClient
@@ -38,18 +33,14 @@ type CQBot struct {
 	lock   sync.RWMutex
 	events []func(*Event)
 
-	db               *leveldb.DB
+	db               db.IDatabase
 	friendReqCache   sync.Map
 	tempSessionCache sync.Map
-	oneWayMsgCache   sync.Map
 }
 
-// MSG 消息Map
-type MSG map[string]interface{}
-
 // Event 事件
 type Event struct {
-	RawMsg MSG
+	RawMsg global.MSG
 
 	once   sync.Once
 	buffer *bytes.Buffer
@@ -75,49 +66,38 @@ func (e *Event) JSONString() string {
 	return utils.B2S(e.buffer.Bytes())
 }
 
-// ForceFragmented 是否启用强制分片
-var ForceFragmented = false
-
-// SkipMimeScan 是否跳过Mime扫描
-var SkipMimeScan bool
-
-var lawfulImageTypes = []string{"image/png", "image/jpeg", "image/gif", "image/bmp"}
-
-var lawfulAudioTypes = []string{
-	"audio/mpeg", "audio/flac", "audio/midi", "audio/ogg",
-	"audio/ape", "audio/amr", "audio/wav", "audio/aiff",
-	"audio/mp4", "audio/aac", "audio/x-m4a",
-}
-
 // NewQQBot 初始化一个QQBot实例
-func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
+func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
-	enableLevelDB := false
-	node, ok := conf.Database["leveldb"]
-	if ok {
+	levelNode, levelDB := base.Database["leveldb"]
+	mongoNode, mongoDB := base.Database["mongodb"]
+	multiDB := db.NewMultiDatabase()
+	if levelDB {
 		lconf := new(config.LevelDBConfig)
-		_ = node.Decode(lconf)
-		enableLevelDB = lconf.Enable
-	}
-	if enableLevelDB {
-		p := path.Join("data", "leveldb")
-		db, err := leveldb.OpenFile(p, &opt.Options{
-			WriteBuffer: 128 * opt.KiB,
-		})
-		if err != nil {
-			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
+		_ = levelNode.Decode(lconf)
+		if lconf.Enable {
+			multiDB.UseDB(db.UseLevelDB())
 		}
-		bot.db = db
-		gob.Register(message.Sender{})
-		log.Info("信息数据库初始化完成.")
-	} else {
-		log.Warn("警告: 信息数据库已关闭，将无法使用 [回复/撤回] 等功能。")
 	}
+	if mongoDB {
+		lconf := new(config.MongoDBConfig)
+		_ = mongoNode.Decode(lconf)
+		if lconf.Database == "" {
+			lconf.Database = "gocq-database"
+		}
+		if lconf.Enable {
+			multiDB.UseDB(db.UseMongoDB(lconf.URI, lconf.Database))
+		}
+	}
+	if err := multiDB.Open(); err != nil {
+		log.Fatalf("打开数据库失败: %v", err)
+	}
+	bot.db = multiDB
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	if conf.Message.ReportSelfMessage {
+	if base.ReportSelfMessage {
 		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
@@ -126,6 +106,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
 	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
 	bot.Client.OnFriendNotify(bot.friendNotifyEvent)
+	bot.Client.OnMemberSpecialTitleUpdated(bot.memberTitleUpdatedEvent)
 	bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
 	bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
 	bot.Client.OnJoinGroup(bot.joinGroupEvent)
@@ -141,24 +122,20 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		i := conf.Heartbeat.Interval
-		if i < 0 || conf.Heartbeat.Disabled {
+		if base.HeartbeatInterval == 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
-		if i == 0 {
-			i = 5
-		}
-		t := time.NewTicker(time.Second * time.Duration(i))
+		t := time.NewTicker(base.HeartbeatInterval)
 		for {
 			<-t.C
-			bot.dispatchEventMessage(MSG{
+			bot.dispatchEventMessage(global.MSG{
 				"time":            time.Now().Unix(),
 				"self_id":         bot.Client.Uin,
 				"post_type":       "meta_event",
 				"meta_event_type": "heartbeat",
 				"status":          bot.CQGetStatus()["data"],
-				"interval":        1000 * i,
+				"interval":        base.HeartbeatInterval.Milliseconds(),
 			})
 		}
 	}()
@@ -172,22 +149,6 @@ func (bot *CQBot) OnEventPush(f func(e *Event)) {
 	bot.lock.Unlock()
 }
 
-// GetMessage 获取给定消息id对应的消息
-func (bot *CQBot) GetMessage(mid int32) MSG {
-	if bot.db != nil {
-		m := MSG{}
-		data, err := bot.db.Get(binary.ToBytes(mid), nil)
-		if err == nil {
-			err = gob.NewDecoder(bytes.NewReader(data)).Decode(&m)
-			if err == nil {
-				return m
-			}
-		}
-		log.Warnf("获取信息时出现错误: %v id: %v", err, mid)
-	}
-	return nil
-}
-
 // UploadLocalImageAsGroup 上传本地图片至群聊
 func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
 	if img.File != "" {
@@ -198,7 +159,7 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 		defer func() { _ = f.Close() }()
 		img.Stream = f
 	}
-	if lawful, mime := IsLawfulImage(img.Stream); !lawful {
+	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
 		return nil, errors.New("image type error: " + mime)
 	}
 	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
@@ -211,35 +172,32 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 
 // UploadLocalVideo 上传本地短视频至群聊
 func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
-	if v.File != "" {
-		video, err := os.Open(v.File)
-		if err != nil {
-			return nil, err
-		}
-		defer video.Close()
-		hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
-		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
-		_, _ = video.Seek(0, io.SeekStart)
-		_, _ = v.thumb.Seek(0, io.SeekStart)
-		return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+	video, err := os.Open(v.File)
+	if err != nil {
+		return nil, err
 	}
-	return &v.ShortVideoElement, nil
+	defer video.Close()
+	hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
+	cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
+	_, _ = video.Seek(0, io.SeekStart)
+	_, _ = v.thumb.Seek(0, io.SeekStart)
+	return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
 }
 
 // UploadLocalImageAsPrivate 上传本地图片至私聊
 func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
-	if img.Stream != nil {
-		i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
-	} else {
-		// need update.
-		f, e := os.Open(img.File)
-		if e != nil {
-			return nil, e
+	if img.File != "" {
+		f, err := os.Open(img.File)
+		if err != nil {
+			return nil, errors.Wrap(err, "open image error")
 		}
-		defer f.Close()
-		i, err = bot.Client.UploadPrivateImage(userID, f)
+		defer func() { _ = f.Close() }()
+		img.Stream = f
 	}
-
+	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
+		return nil, errors.New("image type error: " + mime)
+	}
+	i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
 	if i != nil {
 		i.Flash = img.Flash
 	}
@@ -289,7 +247,7 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem)
-	ret := bot.Client.SendGroupMessage(groupID, m, ForceFragmented)
+	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
 		return -1
@@ -303,7 +261,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 	for _, e := range m.Elements {
 		switch i := e.(type) {
 		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
-			i, err := bot.uploadMedia(i, groupID, false)
+			i, err := bot.uploadMedia(i, target, false)
 			if err != nil {
 				log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
 				continue
@@ -313,7 +271,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
 		case *message.MusicShareElement:
-			bot.Client.SendFriendMusicShare(groupID, i)
+			bot.Client.SendFriendMusicShare(target, i)
 			return 0
 		}
 		newElem = append(newElem, e)
@@ -324,13 +282,31 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem)
+
+	// 单向好友是否存在
+	unidirectionalFriendExists := func() bool {
+		list, err := bot.Client.GetUnidirectionalFriendList()
+		if err != nil {
+			return false
+		}
+		for _, f := range list {
+			if f.Uin == target {
+				return true
+			}
+		}
+		return false
+	}
+
+	session, ok := bot.tempSessionCache.Load(target)
 	var id int32 = -1
-	if bot.Client.FindFriend(target) != nil { // 双向好友
+
+	switch {
+	case bot.Client.FindFriend(target) != nil: // 双向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	} else if session, ok := bot.tempSessionCache.Load(target); ok || groupID != 0 { // 临时会话
+	case ok || groupID != 0: // 临时会话
 		switch {
 		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
@@ -341,8 +317,9 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		default:
 			if session == nil && groupID != 0 {
 				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
-				if msg != nil {
-					id = bot.InsertTempMessage(target, msg)
+				if msg != nil { // nolint
+					// todo(Mrs4s)
+					// id = bot.InsertTempMessage(target, msg)
 				}
 				break
 			}
@@ -351,16 +328,17 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 				log.Errorf("发送临时会话消息失败: %v", err)
 				break
 			}
-			if msg != nil {
-				id = bot.InsertTempMessage(target, msg)
+			if msg != nil { // nolint
+				// todo(Mrs4s)
+				// id = bot.InsertTempMessage(target, msg)
 			}
 		}
-	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
+	case unidirectionalFriendExists(): // 单向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	} else {
+	default:
 		nickname := "Unknown"
 		if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
 			nickname = summaryInfo.Nickname
@@ -372,70 +350,104 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 
 // InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
-	val := MSG{
-		"message-id":  m.Id,
-		"internal-id": m.InternalId,
-		"group":       m.GroupCode,
-		"group-name":  m.GroupName,
-		"sender":      m.Sender,
-		"time":        m.Time,
-		"message":     ToStringMessage(m.Elements, m.GroupCode, true),
+	t := &message.SendingMessage{Elements: m.Elements}
+	replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
+		_, ok := e.(*message.ReplyElement)
+		return ok
+	})
+	msg := &db.StoredGroupMessage{
+		ID:       encodeMessageID(m.GroupCode, m.Id),
+		GlobalID: db.ToGlobalID(m.GroupCode, m.Id),
+		SubType:  "normal",
+		Attribute: &db.StoredMessageAttribute{
+			MessageSeq: m.Id,
+			InternalID: m.InternalId,
+			SenderUin:  m.Sender.Uin,
+			SenderName: m.Sender.DisplayName(),
+			Timestamp:  int64(m.Time),
+		},
+		GroupCode: m.GroupCode,
+		AnonymousID: func() string {
+			if m.Sender.IsAnonymous() {
+				return m.Sender.AnonymousInfo.AnonymousId
+			}
+			return ""
+		}(),
+		Content: ToMessageContent(m.Elements),
 	}
-	id := toGlobalID(m.GroupCode, m.Id)
-	if bot.db != nil {
-		buf := global.NewBuffer()
-		defer global.PutBuffer(buf)
-		if err := gob.NewEncoder(buf).Encode(val); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
-		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
+	if replyElem != nil {
+		reply := replyElem.(*message.ReplyElement)
+		msg.SubType = "quote"
+		msg.QuotedInfo = &db.QuotedInfo{
+			PrevID:        encodeMessageID(m.GroupCode, reply.ReplySeq),
+			PrevGlobalID:  db.ToGlobalID(m.GroupCode, reply.ReplySeq),
+			QuotedContent: ToMessageContent(reply.Elements),
 		}
 	}
-	return id
+	if err := bot.db.InsertGroupMessage(msg); err != nil {
+		log.Warnf("记录聊天数据时出现错误: %v", err)
+		return -1
+	}
+	return msg.GlobalID
 }
 
 // InsertPrivateMessage 私聊消息入数据库
 func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
-	val := MSG{
-		"message-id":  m.Id,
-		"internal-id": m.InternalId,
-		"target":      m.Target,
-		"sender":      m.Sender,
-		"time":        m.Time,
-		"message":     ToStringMessage(m.Elements, 0, true),
+	t := &message.SendingMessage{Elements: m.Elements}
+	replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
+		_, ok := e.(*message.ReplyElement)
+		return ok
+	})
+	msg := &db.StoredPrivateMessage{
+		ID:       encodeMessageID(m.Sender.Uin, m.Id),
+		GlobalID: db.ToGlobalID(m.Sender.Uin, m.Id),
+		SubType:  "normal",
+		Attribute: &db.StoredMessageAttribute{
+			MessageSeq: m.Id,
+			InternalID: m.InternalId,
+			SenderUin:  m.Sender.Uin,
+			SenderName: m.Sender.DisplayName(),
+			Timestamp:  int64(m.Time),
+		},
+		SessionUin: func() int64 {
+			if m.Sender.Uin == m.Self {
+				return m.Target
+			}
+			return m.Sender.Uin
+		}(),
+		TargetUin: m.Target,
+		Content:   ToMessageContent(m.Elements),
 	}
-	id := toGlobalID(m.Sender.Uin, m.Id)
-	if bot.db != nil {
-		buf := global.NewBuffer()
-		defer global.PutBuffer(buf)
-		if err := gob.NewEncoder(buf).Encode(val); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
-		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
+	if replyElem != nil {
+		reply := replyElem.(*message.ReplyElement)
+		msg.SubType = "quote"
+		msg.QuotedInfo = &db.QuotedInfo{
+			PrevID:        encodeMessageID(reply.Sender, reply.ReplySeq),
+			PrevGlobalID:  db.ToGlobalID(reply.Sender, reply.ReplySeq),
+			QuotedContent: ToMessageContent(m.Elements),
 		}
 	}
-	return id
+	if err := bot.db.InsertPrivateMessage(msg); err != nil {
+		log.Warnf("记录聊天数据时出现错误: %v", err)
+		return -1
+	}
+	return msg.GlobalID
 }
 
+/*
 // InsertTempMessage 临时消息入数据库
 func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
-	val := MSG{
+	val := global.MSG{
 		"message-id": m.Id,
 		// FIXME(InsertTempMessage) InternalId missing
-		"group":      m.GroupCode,
+		"from-group": m.GroupCode,
 		"group-name": m.GroupName,
 		"target":     target,
 		"sender":     m.Sender,
 		"time":       int32(time.Now().Unix()),
 		"message":    ToStringMessage(m.Elements, 0, true),
 	}
-	id := toGlobalID(m.Sender.Uin, m.Id)
+	id := db.ToGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
 		buf := global.NewBuffer()
 		defer global.PutBuffer(buf)
@@ -450,20 +462,14 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 	}
 	return id
 }
-
-// toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
-func toGlobalID(code int64, msgID int32) int32 {
-	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
-}
+*/
 
 // Release 释放Bot实例
 func (bot *CQBot) Release() {
-	if bot.db != nil {
-		_ = bot.db.Close()
-	}
+
 }
 
-func (bot *CQBot) dispatchEventMessage(m MSG) {
+func (bot *CQBot) dispatchEventMessage(m global.MSG) {
 	bot.lock.RLock()
 	defer bot.lock.RUnlock()
 
@@ -491,9 +497,9 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
 	global.PutBuffer(event.buffer)
 }
 
-func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
 	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
-	gm := MSG{
+	gm := global.MSG{
 		"anonymous":    nil,
 		"font":         0,
 		"group_id":     m.GroupCode,
@@ -508,7 +514,7 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 		}(),
 		"raw_message": cqm,
 		"self_id":     bot.Client.Uin,
-		"sender": MSG{
+		"sender": global.MSG{
 			"age":     0,
 			"area":    "",
 			"level":   "",
@@ -516,16 +522,16 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 			"user_id": m.Sender.Uin,
 		},
 		"sub_type": "normal",
-		"time":     time.Now().Unix(),
+		"time":     m.Time,
 		"user_id":  m.Sender.Uin,
 	}
 	if m.Sender.IsAnonymous() {
-		gm["anonymous"] = MSG{
+		gm["anonymous"] = global.MSG{
 			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
 			"id":   m.Sender.Uin,
 			"name": m.Sender.AnonymousInfo.AnonymousNick,
 		}
-		gm["sender"].(MSG)["nickname"] = "匿名消息"
+		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
 		gm["sub_type"] = "anonymous"
 	} else {
 		group := bot.Client.FindGroup(m.GroupCode)
@@ -543,7 +549,7 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 				return nil
 			}
 		}
-		ms := gm["sender"].(MSG)
+		ms := gm["sender"].(global.MSG)
 		switch mem.Permission {
 		case client.Owner:
 			ms["role"] = "owner"
@@ -590,20 +596,10 @@ func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group b
 	return nil, errors.New("unsupported message element type")
 }
 
-// IsLawfulImage 判断给定流是否为合法图片
-// 返回 是否合法, 实际Mime
-// 判断后会自动将 Stream Seek 至 0
-func IsLawfulImage(r io.ReadSeeker) (bool, string) {
-	if SkipMimeScan {
-		return true, ""
-	}
-	_, _ = r.Seek(0, io.SeekStart)
-	defer func() { _, _ = r.Seek(0, io.SeekStart) }()
-	t, err := mimetype.DetectReader(r)
-	if err != nil {
-		log.Debugf("扫描 Mime 时出现问题: %v", err)
-		return false, ""
-	}
-	mime := t.String()
-	return mimetype.EqualsAny(mime, lawfulImageTypes...), mime
+// encodeMessageID 临时先这样, 暂时用不上
+func encodeMessageID(target int64, seq int32) string {
+	return hex.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
+		w.WriteUInt64(uint64(target))
+		w.WriteUInt32(uint32(seq))
+	}))
 }

coolq/cqcode.go

@@ -3,7 +3,6 @@ package coolq
 import (
 	"bytes"
 	"crypto/md5"
-	"encoding/base64"
 	"encoding/hex"
 	xml2 "encoding/xml"
 	"errors"
@@ -18,16 +17,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gabriel-vasile/mimetype"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/codec"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/param"
 )
 
 /*
@@ -36,18 +36,6 @@ var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 */
 
-// RemoveReplyAt 是否删除reply后的at
-var RemoveReplyAt bool
-
-// ExtraReplyData 是否上报额外reply信息
-var ExtraReplyData bool
-
-// IgnoreInvalidCQCode 是否忽略无效CQ码
-var IgnoreInvalidCQCode = false
-
-// SplitURL 是否分割URL
-var SplitURL = false
-
 const (
 	maxImageSize = 1024 * 1024 * 30  // 30MB
 	maxVideoSize = 1024 * 1024 * 100 // 100MB
@@ -81,7 +69,6 @@ type LocalVoiceElement struct {
 
 // LocalVideoElement 本地视频
 type LocalVideoElement struct {
-	message.ShortVideoElement
 	File  string
 	thumb io.ReadSeeker
 }
@@ -97,6 +84,11 @@ func (e *GiftElement) Type() message.ElementType {
 	return message.At
 }
 
+// Type impl message.IMessageElement
+func (e *LocalVideoElement) Type() message.ElementType {
+	return message.Video
+}
+
 // GiftID 礼物ID数组
 var GiftID = [...]message.GroupGift{
 	message.SweetWink,
@@ -122,8 +114,8 @@ func (e *PokeElement) Type() message.ElementType {
 }
 
 // ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
-func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
-	r = make([]MSG, 0, len(e))
+func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG) {
+	r = make([]global.MSG, 0, len(e))
 	m := &message.SendingMessage{Elements: e}
 	reply := m.FirstOrNil(func(e message.IMessageElement) bool {
 		_, ok := e.(*message.ReplyElement)
@@ -135,11 +127,11 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
 		if rid == 0 {
 			rid = replyElem.Sender
 		}
-		if ExtraReplyData {
-			r = append(r, MSG{
+		if base.ExtraReplyData {
+			r = append(r, global.MSG{
 				"type": "reply",
 				"data": map[string]string{
-					"id":   strconv.FormatInt(int64(toGlobalID(rid, replyElem.ReplySeq)), 10),
+					"id":   strconv.FormatInt(int64(db.ToGlobalID(rid, replyElem.ReplySeq)), 10),
 					"seq":  strconv.FormatInt(int64(replyElem.ReplySeq), 10),
 					"qq":   strconv.FormatInt(replyElem.Sender, 10),
 					"time": strconv.FormatInt(int64(replyElem.Time), 10),
@@ -147,71 +139,71 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
 				},
 			})
 		} else {
-			r = append(r, MSG{
+			r = append(r, global.MSG{
 				"type": "reply",
-				"data": map[string]string{"id": strconv.FormatInt(int64(toGlobalID(rid, replyElem.ReplySeq)), 10)},
+				"data": map[string]string{"id": strconv.FormatInt(int64(db.ToGlobalID(rid, replyElem.ReplySeq)), 10)},
 			})
 		}
 	}
 	for i, elem := range e {
-		var m MSG
+		var m global.MSG
 		switch o := elem.(type) {
 		case *message.ReplyElement:
-			if RemoveReplyAt && i+1 < len(e) && e[i+1].Type() == message.At {
+			if base.RemoveReplyAt && i+1 < len(e) {
 				elem, ok := e[i+1].(*message.AtElement)
 				if ok && elem.Target == o.Sender {
 					e[i+1] = nil
 				}
 			}
 		case *message.TextElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "text",
 				"data": map[string]string{"text": o.Content},
 			}
 		case *message.LightAppElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "json",
 				"data": map[string]string{"data": o.Content},
 			}
 		case *message.AtElement:
 			if o.Target == 0 {
-				m = MSG{
+				m = global.MSG{
 					"type": "at",
 					"data": map[string]string{"qq": "all"},
 				}
 			} else {
-				m = MSG{
+				m = global.MSG{
 					"type": "at",
 					"data": map[string]string{"qq": strconv.FormatInt(o.Target, 10)},
 				}
 			}
 		case *message.RedBagElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "redbag",
 				"data": map[string]string{"title": o.Title},
 			}
 		case *message.ForwardElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "forward",
 				"data": map[string]string{"id": o.ResId},
 			}
 		case *message.FaceElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "face",
 				"data": map[string]string{"id": strconv.FormatInt(int64(o.Index), 10)},
 			}
 		case *message.VoiceElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "record",
 				"data": map[string]string{"file": o.Name, "url": o.Url},
 			}
 		case *message.ShortVideoElement:
-			m = MSG{
+			m = global.MSG{
 				"type": "video",
 				"data": map[string]string{"file": o.Name, "url": o.Url},
 			}
 		case *message.GroupImageElement:
-			data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
+			data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url, "subType": strconv.FormatInt(int64(o.ImageBizType), 10)}
 			switch {
 			case o.Flash:
 				data["type"] = "flash"
@@ -219,7 +211,7 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
 				data["type"] = "show"
 				data["id"] = strconv.FormatInt(int64(o.EffectID), 10)
 			}
-			m = MSG{
+			m = global.MSG{
 				"type": "image",
 				"data": data,
 			}
@@ -228,18 +220,18 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
 			if o.Flash {
 				data["type"] = "flash"
 			}
-			m = MSG{
+			m = global.MSG{
 				"type": "image",
 				"data": data,
 			}
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
-				m = MSG{
+				m = global.MSG{
 					"type": "xml",
 					"data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)},
 				}
 			} else {
-				m = MSG{
+				m = global.MSG{
 					"type": "json",
 					"data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)},
 				}
@@ -277,19 +269,19 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 		if rid == 0 {
 			rid = replyElem.Sender
 		}
-		if ExtraReplyData {
+		if base.ExtraReplyData {
 			write("[CQ:reply,id=%d,seq=%d,qq=%d,time=%d,text=%s]",
-				toGlobalID(rid, replyElem.ReplySeq),
+				db.ToGlobalID(rid, replyElem.ReplySeq),
 				replyElem.ReplySeq, replyElem.Sender, replyElem.Time,
 				CQCodeEscapeValue(ToStringMessage(replyElem.Elements, groupID)))
 		} else {
-			write("[CQ:reply,id=%d]", toGlobalID(rid, replyElem.ReplySeq))
+			write("[CQ:reply,id=%d]", db.ToGlobalID(rid, replyElem.ReplySeq))
 		}
 	}
 	for i, elem := range e {
 		switch o := elem.(type) {
 		case *message.ReplyElement:
-			if RemoveReplyAt && len(e) > i+1 {
+			if base.RemoveReplyAt && len(e) > i+1 {
 				elem, ok := e[i+1].(*message.AtElement)
 				if ok && elem.Target == o.Sender {
 					e[i+1] = nil
@@ -328,6 +320,7 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 			} else if o.EffectID != 0 {
 				arg = ",type=show,id=" + strconv.FormatInt(int64(o.EffectID), 10)
 			}
+			arg += ",subType=" + strconv.FormatInt(int64(o.ImageBizType), 10)
 			if ur {
 				write("[CQ:image,file=%s%s]", hex.EncodeToString(o.Md5)+".image", arg)
 			} else {
@@ -358,6 +351,110 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 	return
 }
 
+// ToMessageContent 将消息转换成 Content. 忽略 Reply
+// 不同于 onebot 的 Array Message, 此函数转换出来的 Content 的 data 段为实际类型
+// 方便数据库查询
+func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
+	for _, elem := range e {
+		var m global.MSG
+		switch o := elem.(type) {
+		case *message.TextElement:
+			m = global.MSG{
+				"type": "text",
+				"data": global.MSG{"text": o.Content},
+			}
+		case *message.LightAppElement:
+			m = global.MSG{
+				"type": "json",
+				"data": global.MSG{"data": o.Content},
+			}
+		case *message.AtElement:
+			if o.Target == 0 {
+				m = global.MSG{
+					"type": "at",
+					"data": global.MSG{
+						"subType": "all",
+					},
+				}
+			} else {
+				m = global.MSG{
+					"type": "at",
+					"data": global.MSG{
+						"subType": "user",
+						"target":  o.Target,
+						"display": o.Display,
+					},
+				}
+			}
+		case *message.RedBagElement:
+			m = global.MSG{
+				"type": "redbag",
+				"data": global.MSG{"title": o.Title, "type": o.MsgType},
+			}
+		case *message.ForwardElement:
+			m = global.MSG{
+				"type": "forward",
+				"data": global.MSG{"id": o.ResId},
+			}
+		case *message.FaceElement:
+			m = global.MSG{
+				"type": "face",
+				"data": global.MSG{"id": o.Index},
+			}
+		case *message.VoiceElement:
+			m = global.MSG{
+				"type": "record",
+				"data": global.MSG{"file": o.Name, "url": o.Url},
+			}
+		case *message.ShortVideoElement:
+			m = global.MSG{
+				"type": "video",
+				"data": global.MSG{"file": o.Name, "url": o.Url},
+			}
+		case *message.GroupImageElement:
+			data := global.MSG{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url, "subType": uint32(o.ImageBizType)}
+			switch {
+			case o.Flash:
+				data["type"] = "flash"
+			case o.EffectID != 0:
+				data["type"] = "show"
+				data["id"] = o.EffectID
+			}
+			m = global.MSG{
+				"type": "image",
+				"data": data,
+			}
+		case *message.FriendImageElement:
+			data := global.MSG{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
+			if o.Flash {
+				data["type"] = "flash"
+			}
+			m = global.MSG{
+				"type": "image",
+				"data": data,
+			}
+		case *message.ServiceElement:
+			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
+				m = global.MSG{
+					"type": "xml",
+					"data": global.MSG{"data": o.Content, "resid": o.Id},
+				}
+			} else {
+				m = global.MSG{
+					"type": "json",
+					"data": global.MSG{"data": o.Content, "resid": o.Id},
+				}
+			}
+		default:
+			continue
+		}
+		if m != nil {
+			r = append(r, m)
+		}
+	}
+	return
+}
+
 // ConvertStringMessage 将消息字符串转为消息元素数组
 func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IMessageElement) {
 	var t, key string
@@ -376,7 +473,7 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 			switch {
 			case customText != "":
 				var elem *message.ReplyElement
-				var org MSG
+				var org db.IStoredMessage
 				sender, senderErr := strconv.ParseInt(d["qq"], 10, 64)
 				if senderErr != nil && err != nil {
 					log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
@@ -388,13 +485,13 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 				}
 				messageSeq, seqErr := strconv.ParseInt(d["seq"], 10, 64)
 				if err == nil {
-					org = bot.GetMessage(int32(mid))
+					org, _ = bot.db.GetMessageByGlobalID(int32(mid))
 				}
 				if org != nil {
 					elem = &message.ReplyElement{
-						ReplySeq: org["message-id"].(int32),
-						Sender:   org["sender"].(message.Sender).Uin,
-						Time:     org["time"].(int32),
+						ReplySeq: org.GetAttribute().MessageSeq,
+						Sender:   org.GetAttribute().SenderUin,
+						Time:     int32(org.GetAttribute().Timestamp),
 						Elements: bot.ConvertStringMessage(customText, isGroup),
 					}
 					if senderErr != nil {
@@ -416,14 +513,14 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 				}
 				r = append([]message.IMessageElement{elem}, r...)
 			case err == nil:
-				org := bot.GetMessage(int32(mid))
-				if org != nil {
+				org, err := bot.db.GetMessageByGlobalID(int32(mid))
+				if err == nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
-							ReplySeq: org["message-id"].(int32),
-							Sender:   org["sender"].(message.Sender).Uin,
-							Time:     org["time"].(int32),
-							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
+							ReplySeq: org.GetAttribute().MessageSeq,
+							Sender:   org.GetAttribute().SenderUin,
+							Time:     int32(org.GetAttribute().Timestamp),
+							Elements: bot.ConvertContentMessage(org.GetContent(), isGroup),
 						},
 					}, r...)
 				}
@@ -451,7 +548,7 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 				org += "," + k + "=" + v
 			}
 			org += "]"
-			if !IgnoreInvalidCQCode {
+			if !base.IgnoreInvalidCQCode {
 				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
 				r = append(r, message.NewText(org))
 			} else {
@@ -473,8 +570,8 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 			i++
 		}
 		if i > 0 {
-			if SplitURL {
-				for _, txt := range global.SplitURL(CQCodeUnescapeText(raw[:i])) {
+			if base.SplitURL {
+				for _, txt := range param.SplitURL(CQCodeUnescapeText(raw[:i])) {
 					r = append(r, message.NewText(txt))
 				}
 			} else {
@@ -548,7 +645,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 			switch {
 			case customText != "":
 				var elem *message.ReplyElement
-				var org MSG
+				var org db.IStoredMessage
 				sender, senderErr := strconv.ParseInt(e.Get("data.[user_id,qq]").String(), 10, 64)
 				if senderErr != nil && err != nil {
 					log.Warnf("警告: 自定义 Reply 元素中必须包含 user_id 或 id")
@@ -560,13 +657,13 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 				}
 				messageSeq, seqErr := strconv.ParseInt(e.Get("data.seq").String(), 10, 64)
 				if err == nil {
-					org = bot.GetMessage(int32(mid))
+					org, _ = bot.db.GetMessageByGlobalID(int32(mid))
 				}
 				if org != nil {
 					elem = &message.ReplyElement{
-						ReplySeq: org["message-id"].(int32),
-						Sender:   org["sender"].(message.Sender).Uin,
-						Time:     org["time"].(int32),
+						ReplySeq: org.GetAttribute().MessageSeq,
+						Sender:   org.GetAttribute().SenderUin,
+						Time:     int32(org.GetAttribute().Timestamp),
 						Elements: bot.ConvertStringMessage(customText, isGroup),
 					}
 					if senderErr != nil {
@@ -588,14 +685,14 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 				}
 				r = append([]message.IMessageElement{elem}, r...)
 			case err == nil:
-				org := bot.GetMessage(int32(mid))
-				if org != nil {
+				org, err := bot.db.GetMessageByGlobalID(int32(mid))
+				if err == nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
-							ReplySeq: org["message-id"].(int32),
-							Sender:   org["sender"].(message.Sender).Uin,
-							Time:     org["time"].(int32),
-							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
+							ReplySeq: org.GetAttribute().MessageSeq,
+							Sender:   org.GetAttribute().SenderUin,
+							Time:     int32(org.GetAttribute().Timestamp),
+							Elements: bot.ConvertContentMessage(org.GetContent(), isGroup),
 						},
 					}, r...)
 				}
@@ -651,6 +748,75 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 	return
 }
 
+// ConvertContentMessage 将数据库用的 content 转换为消息元素数组
+func (bot *CQBot) ConvertContentMessage(content []global.MSG, group bool) (r []message.IMessageElement) {
+	for _, c := range content {
+		data := c["data"].(global.MSG)
+		switch c["type"] {
+		case "text":
+			r = append(r, message.NewText(data["text"].(string)))
+		case "image":
+			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, false, group)
+			if err != nil {
+				log.Warnf("make image elem error: %v", err)
+				continue
+			}
+			flash, id := false, int32(0)
+			if t, ok := data["type"]; ok {
+				if t.(string) == "flash" {
+					flash = true
+				}
+				if t.(string) == "show" {
+					id = data["id"].(int32)
+					if id < 40000 || id >= 40006 {
+						id = 40000
+					}
+				}
+			}
+			switch img := e.(type) {
+			case *LocalImageElement:
+				img.Flash = flash
+				img.EffectID = id
+			case *message.GroupImageElement:
+				img.Flash = flash
+				img.EffectID = id
+				img.ImageBizType = message.ImageBizType(data["subType"].(uint32))
+			case *message.FriendImageElement:
+				img.Flash = flash
+			}
+			r = append(r, e)
+		case "at":
+			switch data["subType"].(string) {
+			case "all":
+				r = append(r, message.NewAt(0))
+			case "user":
+				r = append(r, message.NewAt(data["target"].(int64), data["display"].(string)))
+			default:
+				continue
+			}
+		case "redbag":
+			r = append(r, &message.RedBagElement{
+				MsgType: message.RedBagMessageType(data["type"].(int)),
+				Title:   data["title"].(string),
+			})
+		case "forward":
+			r = append(r, &message.ForwardElement{
+				ResId: data["id"].(string),
+			})
+		case "face":
+			r = append(r, message.NewFace(data["id"].(int32)))
+		case "video":
+			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, true, group)
+			if err != nil {
+				log.Warnf("make image elem error: %v", err)
+				continue
+			}
+			r = append(r, e)
+		}
+	}
+	return
+}
+
 // ToElement 将解码后的CQCode转换为Element.
 //
 // 返回 interface{} 存在三种类型
@@ -659,9 +825,9 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m interface{}, err error) {
 	switch t {
 	case "text":
-		if SplitURL {
+		if base.SplitURL {
 			var ret []message.IMessageElement
-			for _, text := range global.SplitURL(d["text"]) {
+			for _, text := range param.SplitURL(d["text"]) {
 				ret = append(ret, message.NewText(text))
 			}
 			return ret, nil
@@ -692,6 +858,8 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		case *message.GroupImageElement:
 			img.Flash = flash
 			img.EffectID = int32(id)
+			i, _ := strconv.ParseInt(d["subType"], 10, 64)
+			img.ImageBizType = message.ImageBizType(i)
 		case *message.FriendImageElement:
 			img.Flash = flash
 		}
@@ -720,7 +888,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
-		return &message.VoiceElement{Data: codec.RecodeTo24K(data)}, nil
+		return &message.VoiceElement{Data: base.ResampleSilk(data)}, nil
 	case "record":
 		f := d["file"]
 		data, err := global.FindFile(f, d["cache"], global.VoicePath)
@@ -730,9 +898,9 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
-		if !SkipMimeScan && !global.IsAMRorSILK(data) {
-			mt := mimetype.Detect(data).String()
-			if !mimetype.EqualsAny(mt, lawfulAudioTypes...) {
+		if !global.IsAMRorSILK(data) {
+			lawful, mt := base.IsLawfulAudio(bytes.NewReader(data))
+			if !lawful {
 				return nil, errors.New("audio type error: " + mt)
 			}
 		}
@@ -895,7 +1063,10 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
-		v := file.(*LocalVideoElement)
+		v, ok := file.(*LocalVideoElement)
+		if !ok {
+			return file, nil
+		}
 		if v.File == "" {
 			return v, nil
 		}
@@ -1102,7 +1273,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 		return &LocalImageElement{File: fu.Path}, nil
 	}
 	if strings.HasPrefix(f, "base64") && !video {
-		b, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(f, "base64://"))
+		b, err := param.Base64DecodeString(strings.TrimPrefix(f, "base64://"))
 		if err != nil {
 			return nil, err
 		}
@@ -1110,95 +1281,98 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 	}
 	rawPath := path.Join(global.ImagePath, f)
 	if video {
+		if strings.HasSuffix(f, ".video") && cache.EnableCacheDB {
+			hash, err := hex.DecodeString(strings.TrimSuffix(f, ".video"))
+			if err == nil {
+				if b := cache.Video.Get(hash); b != nil {
+					return bot.readVideoCache(b), nil
+				}
+			}
+		}
 		rawPath = path.Join(global.VideoPath, f)
 		if !global.PathExists(rawPath) {
 			return nil, errors.New("invalid video")
 		}
-		if path.Ext(rawPath) == ".video" {
-			b, _ := os.ReadFile(rawPath)
-			r := binary.NewReader(b)
-			return &LocalVideoElement{ShortVideoElement: message.ShortVideoElement{ // todo 检查缓存是否有效
-				Md5:       r.ReadBytes(16),
-				ThumbMd5:  r.ReadBytes(16),
-				Size:      r.ReadInt32(),
-				ThumbSize: r.ReadInt32(),
-				Name:      r.ReadString(),
-				Uuid:      r.ReadAvailable(),
-			}}, nil
+		if path.Ext(rawPath) != ".video" {
+			return &LocalVideoElement{File: rawPath}, nil
+		}
+		b, _ := os.ReadFile(rawPath)
+		return bot.readVideoCache(b), nil
+	}
+	if strings.HasSuffix(f, ".image") && cache.EnableCacheDB {
+		hash, err := hex.DecodeString(strings.TrimSuffix(f, ".image"))
+		if err == nil {
+			if b := cache.Image.Get(hash); b != nil {
+				return bot.readImageCache(b, group)
+			}
 		}
-		return &LocalVideoElement{File: rawPath}, nil
 	}
 	exist := global.PathExists(rawPath)
 	if !exist && global.PathExists(path.Join(global.ImagePathOld, f)) {
 		exist = true
 		rawPath = path.Join(global.ImagePathOld, f)
 	}
-	if !exist && global.PathExists(rawPath+".cqimg") {
-		exist = true
-		rawPath += ".cqimg"
+	if !exist {
+		if d["url"] != "" {
+			return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
+		}
+		return nil, errors.New("invalid image")
 	}
-	if !exist && d["url"] != "" {
-		return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
+	if path.Ext(rawPath) != ".image" {
+		return &LocalImageElement{File: rawPath}, nil
 	}
-	if exist {
-		if path.Ext(rawPath) != ".image" && path.Ext(rawPath) != ".cqimg" {
-			return &LocalImageElement{File: rawPath}, nil
-		}
-		b, err := os.ReadFile(rawPath)
-		if err != nil {
-			return nil, err
-		}
-		if len(b) < 20 {
-			return nil, errors.New("invalid local file")
-		}
-		var (
-			size     int32
-			hash     []byte
-			imageURL string
-		)
-		if path.Ext(rawPath) == ".cqimg" {
-			for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
-				kv := strings.SplitN(line, "=", 2)
-				switch kv[0] {
-				case "md5":
-					hash, _ = hex.DecodeString(strings.ReplaceAll(kv[1], "\r", ""))
-				case "size":
-					t, _ := strconv.Atoi(strings.ReplaceAll(kv[1], "\r", ""))
-					size = int32(t)
-				}
-			}
-		} else {
-			r := binary.NewReader(b)
-			hash = r.ReadBytes(16)
-			size = r.ReadInt32()
-			r.ReadString()
-			imageURL = r.ReadString()
-		}
-		if size == 0 {
-			if imageURL != "" {
-				return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
-			}
-			return nil, errors.New("img size is 0")
-		}
-		if len(hash) != 16 {
-			return nil, errors.New("invalid hash")
-		}
-		var rsp message.IMessageElement
-		if group {
-			rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
-			goto ok
-		}
-		rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
-	ok:
-		if err != nil {
-			if imageURL != "" {
-				return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
-			}
-			return nil, err
-		}
-		return rsp, nil
+	b, err := os.ReadFile(rawPath)
+	if err != nil {
+		return nil, err
+	}
+	return bot.readImageCache(b, group)
+}
+
+func (bot *CQBot) readImageCache(b []byte, group bool) (message.IMessageElement, error) {
+	var err error
+	if len(b) < 20 {
+		return nil, errors.New("invalid cache")
+	}
+	r := binary.NewReader(b)
+	hash := r.ReadBytes(16)
+	size := r.ReadInt32()
+	r.ReadString()
+	imageURL := r.ReadString()
+	if size == 0 {
+		if imageURL != "" {
+			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
+		}
+		return nil, errors.New("img size is 0")
+	}
+	if len(hash) != 16 {
+		return nil, errors.New("invalid hash")
+	}
+	var rsp message.IMessageElement
+	if group {
+		rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
+		goto ok
+	}
+	rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
+ok:
+	if err != nil {
+		if imageURL != "" {
+			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
+		}
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (bot *CQBot) readVideoCache(b []byte) message.IMessageElement {
+	r := binary.NewReader(b)
+	return &message.ShortVideoElement{ // todo 检查缓存是否有效
+		Md5:       r.ReadBytes(16),
+		ThumbMd5:  r.ReadBytes(16),
+		Size:      r.ReadInt32(),
+		ThumbSize: r.ReadInt32(),
+		Name:      r.ReadString(),
+		Uuid:      r.ReadAvailable(),
 	}
-	return nil, errors.New("invalid image")
 }
 
 // makeShowPic 一种xml 方式发送的群消息图片

coolq/cqcode_test.go

@@ -18,8 +18,10 @@ func TestCQBot_ConvertStringMessage(t *testing.T) {
 	}
 }
 
-var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] 123 [`
-var benchArray = gjson.Parse(`[{"type":"text","data":{"text":"asdfqwerqwerqwer"}},{"type":"face","data":{"id":"115","text":"111"}},{"type":"text","data":{"text":"asdfasdfasdfasdfasdfasdfasd"}},{"type":"face","data":{"id":"217"}},{"type":"text","data":{"text":"] "}},{"type":"text","data":{"text":"123"}},{"type":"text","data":{"text":" ["}}]`)
+var (
+	bench      = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] 123 [`
+	benchArray = gjson.Parse(`[{"type":"text","data":{"text":"asdfqwerqwerqwer"}},{"type":"face","data":{"id":"115","text":"111"}},{"type":"text","data":{"text":"asdfasdfasdfasdfasdfasdfasd"}},{"type":"face","data":{"id":"217"}},{"type":"text","data":{"text":"] "}},{"type":"text","data":{"text":"123"}},{"type":"text","data":{"text":" ["}}]`)
+)
 
 func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
@@ -39,7 +41,7 @@ const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&98765
 func BenchmarkCQCodeEscapeText(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		ret := bText
-		ret = CQCodeEscapeText(ret)
+		CQCodeEscapeText(ret)
 	}
 }
 
@@ -48,7 +50,7 @@ func BenchmarkCQCodeEscapeTextBefore(b *testing.B) {
 		ret := bText
 		ret = strings.ReplaceAll(ret, "&", "&amp;")
 		ret = strings.ReplaceAll(ret, "[", "&#91;")
-		ret = strings.ReplaceAll(ret, "]", "&#93;")
+		strings.ReplaceAll(ret, "]", "&#93;")
 	}
 }
 

coolq/event.go

@@ -8,7 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/db"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
+
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
@@ -16,18 +20,11 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var format = "string"
-
-// SetMessageFormat 设置消息上报格式，默认为string
-func SetMessageFormat(f string) {
-	format = f
-}
-
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
 func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r interface{}) {
-	if format == "string" {
+	if base.PostFormat == "string" {
 		r = ToStringMessage(e, groupID, isRaw...)
-	} else if format == "array" {
+	} else if base.PostFormat == "array" {
 		r = ToArrayMessage(e, groupID)
 	}
 	return
@@ -36,15 +33,12 @@ func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...boo
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
 	bot.checkMedia(m.Elements)
 	cqm := ToStringMessage(m.Elements, 0, true)
-	if !m.Sender.IsFriend {
-		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
-	}
 	id := m.Id
 	if bot.db != nil {
 		id = bot.InsertPrivateMessage(m)
 	}
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
-	fm := MSG{
+	fm := global.MSG{
 		"post_type": func() string {
 			if m.Sender.Uin == bot.Client.Uin {
 				return "message_sent"
@@ -61,7 +55,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": MSG{
+		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"nickname": m.Sender.Nickname,
 			"sex":      "unknown",
@@ -69,9 +63,6 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		},
 	}
 	bot.dispatchEventMessage(fm)
-	if m.Sender.Uin != c.Uin {
-		c.MarkPrivateMessageReaded(m.Sender.Uin, int64(m.Time))
-	}
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
@@ -79,12 +70,12 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	for _, elem := range m.Elements {
 		if file, ok := elem.(*message.GroupFileElement); ok {
 			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
-			bot.dispatchEventMessage(MSG{
+			bot.dispatchEventMessage(global.MSG{
 				"post_type":   "notice",
 				"notice_type": "group_upload",
 				"group_id":    m.GroupCode,
 				"user_id":     m.Sender.Uin,
-				"file": MSG{
+				"file": global.MSG{
 					"id":    file.Path,
 					"name":  file.Name,
 					"size":  file.Size,
@@ -109,9 +100,6 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	}
 	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
-	if m.Sender.Uin != c.Uin {
-		c.MarkGroupMessageReaded(m.GroupCode, int64(m.Id))
-	}
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
@@ -120,11 +108,12 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 	cqm := ToStringMessage(m.Elements, 0, true)
 	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
 	id := m.Id
-	if bot.db != nil {
-		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	if bot.db != nil { // nolint
+		// todo(Mrs4s)
+		// id = bot.InsertTempMessage(m.Sender.Uin, m)
 	}
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
-	tm := MSG{
+	tm := global.MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
@@ -136,7 +125,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": MSG{
+		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"group_id": m.GroupCode,
 			"nickname": m.Sender.Nickname,
@@ -167,7 +156,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 		}
 	}
 
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"duration":    e.Time,
 		"group_id":    e.GroupCode,
@@ -187,10 +176,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 
 func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := toGlobalID(e.GroupCode, e.MessageId)
+	gid := 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(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"group_id":    e.GroupCode,
 		"notice_type": "group_recall",
@@ -209,7 +198,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		sender := group.FindMember(notify.Sender)
 		receiver := group.FindMember(notify.Receiver)
 		log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -224,7 +213,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		sender := group.FindMember(notify.Sender)
 		luckyKing := group.FindMember(notify.LuckyKing)
 		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -237,7 +226,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		})
 	case *client.MemberHonorChangedNotifyEvent:
 		log.Info(notify.Content())
-		bot.dispatchEventMessage(MSG{
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -268,8 +257,12 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	friend := c.FindFriend(e.From())
 	if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
-		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
-		bot.dispatchEventMessage(MSG{
+		if notify.Receiver == notify.Sender {
+			log.Infof("好友 %v 戳了戳自己.", friend.Nickname)
+		} else {
+			log.Infof("好友 %v 戳了戳你.", friend.Nickname)
+		}
+		bot.dispatchEventMessage(global.MSG{
 			"post_type":   "notice",
 			"notice_type": "notify",
 			"sub_type":    "poke",
@@ -282,15 +275,31 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	}
 }
 
+func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSpecialTitleUpdatedEvent) {
+	group := c.FindGroup(e.GroupCode)
+	mem := group.FindMember(e.Uin)
+	log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.Name, group.Code, mem.DisplayName(), mem.Uin, e.NewTitle)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":   "notice",
+		"notice_type": "notify",
+		"sub_type":    "title",
+		"group_id":    group.Code,
+		"self_id":     c.Uin,
+		"user_id":     e.Uin,
+		"time":        time.Now().Unix(),
+		"title":       e.NewTitle,
+	})
+}
+
 func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
 	f := c.FindFriend(e.FriendUin)
-	gid := toGlobalID(e.FriendUin, e.MessageId)
+	gid := db.ToGlobalID(e.FriendUin, e.MessageId)
 	if f != nil {
 		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
 	} else {
 		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
 	}
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_recall",
 		"self_id":     c.Uin,
@@ -306,11 +315,11 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
 		return
 	}
 	log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "offline_file",
 		"user_id":     e.Sender,
-		"file": MSG{
+		"file": global.MSG{
 			"name": e.FileName,
 			"size": e.FileSize,
 			"url":  e.DownloadUrl,
@@ -341,7 +350,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 		}
 		return "unset"
 	}()
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_admin",
 		"sub_type":    st,
@@ -354,7 +363,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 
 func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
 	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_card",
 		"group_id":    e.Group.Code,
@@ -384,7 +393,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.friendReqCache.Store(flag, e)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "friend",
 		"user_id":      e.RequesterUin,
@@ -398,7 +407,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
 	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
 	bot.tempSessionCache.Delete(e.Friend.Uin)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_add",
 		"self_id":     c.Uin,
@@ -410,7 +419,7 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "invite",
@@ -426,7 +435,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "add",
@@ -445,11 +454,11 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 	} else {
 		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
 	}
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"notice_type": "client_status",
 		"online":      e.Online,
-		"client": MSG{
+		"client": global.MSG{
 			"app_id":      e.Client.AppId,
 			"device_name": e.Client.DeviceName,
 			"device_kind": e.Client.DeviceKind,
@@ -461,7 +470,7 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 
 func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := toGlobalID(e.GroupCode, e.MessageID)
+	gid := db.ToGlobalID(e.GroupCode, e.MessageID)
 	if e.OperationType == 1 {
 		log.Infof(
 			"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
@@ -482,7 +491,7 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	if e.OperatorUin == bot.Client.Uin {
 		return
 	}
-	bot.dispatchEventMessage(MSG{
+	bot.dispatchEventMessage(global.MSG{
 		"post_type":   "notice",
 		"group_id":    e.GroupCode,
 		"notice_type": "essence",
@@ -500,8 +509,8 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	})
 }
 
-func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
-	return MSG{
+func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
+	return global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_increase",
 		"group_id":    groupCode,
@@ -513,8 +522,8 @@ func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
 	}
 }
 
-func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) MSG {
-	return MSG{
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) global.MSG {
+	return global.MSG{
 		"post_type":   "notice",
 		"notice_type": "group_decrease",
 		"group_id":    groupCode,
@@ -540,29 +549,37 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 }
 
 func (bot *CQBot) checkMedia(e []message.IMessageElement) {
+	// TODO(wdvxdr): remove these old cache file in v1.0.0
 	for _, elem := range e {
 		switch i := elem.(type) {
 		case *message.GroupImageElement:
+			data := binary.NewWriterF(func(w *binary.Writer) {
+				w.Write(i.Md5)
+				w.WriteUInt32(uint32(i.Size))
+				w.WriteString(i.ImageId)
+				w.WriteString(i.Url)
+			})
 			filename := hex.EncodeToString(i.Md5) + ".image"
-			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
-					w.Write(i.Md5)
-					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(i.ImageId)
-					w.WriteString(i.Url)
-				}), 0o644)
+			if cache.EnableCacheDB {
+				cache.Image.Insert(i.Md5, data)
+			} else if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = os.WriteFile(path.Join(global.ImagePath, filename), data, 0o644)
 			}
 		case *message.FriendImageElement:
+			data := binary.NewWriterF(func(w *binary.Writer) {
+				w.Write(i.Md5)
+				w.WriteUInt32(uint32(i.Size))
+				w.WriteString(i.ImageId)
+				w.WriteString(i.Url)
+			})
 			filename := hex.EncodeToString(i.Md5) + ".image"
-			if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
-					w.Write(i.Md5)
-					w.WriteUInt32(uint32(i.Size))
-					w.WriteString(i.ImageId)
-					w.WriteString(i.Url)
-				}), 0o644)
+			if cache.EnableCacheDB {
+				cache.Image.Insert(i.Md5, data)
+			} else if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = os.WriteFile(path.Join(global.ImagePath, filename), data, 0o644)
 			}
 		case *message.VoiceElement:
+			// todo: don't download original file?
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
 			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
@@ -574,16 +591,19 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
 			}
 		case *message.ShortVideoElement:
+			data := binary.NewWriterF(func(w *binary.Writer) {
+				w.Write(i.Md5)
+				w.Write(i.ThumbMd5)
+				w.WriteUInt32(uint32(i.Size))
+				w.WriteUInt32(uint32(i.ThumbSize))
+				w.WriteString(i.Name)
+				w.Write(i.Uuid)
+			})
 			filename := hex.EncodeToString(i.Md5) + ".video"
-			if !global.PathExists(path.Join(global.VideoPath, filename)) {
-				_ = os.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
-					w.Write(i.Md5)
-					w.Write(i.ThumbMd5)
-					w.WriteUInt32(uint32(i.Size))
-					w.WriteUInt32(uint32(i.ThumbSize))
-					w.WriteString(i.Name)
-					w.Write(i.Uuid)
-				}), 0o644)
+			if cache.EnableCacheDB {
+				cache.Video.Insert(i.Md5, data)
+			} else if !global.PathExists(path.Join(global.VideoPath, filename)) {
+				_ = os.WriteFile(path.Join(global.VideoPath, filename), data, 0o644)
 			}
 			i.Name = filename
 			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)

db/database.go

@@ -0,0 +1,101 @@
+package db
+
+import (
+	"fmt"
+	"hash/crc32"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type (
+	// IDatabase 数据库操作接口定义
+	IDatabase interface {
+		// Open 初始化数据库
+		Open() error
+
+		// GetMessageByGlobalID 通过 GlobalID 来获取消息
+		GetMessageByGlobalID(int32) (IStoredMessage, error)
+		// GetGroupMessageByGlobalID 通过 GlobalID 来获取群消息
+		GetGroupMessageByGlobalID(int32) (*StoredGroupMessage, error)
+		// GetPrivateMessageByGlobalID 通过 GlobalID 来获取私聊消息
+		GetPrivateMessageByGlobalID(int32) (*StoredPrivateMessage, error)
+
+		// InsertGroupMessage 向数据库写入新的群消息
+		InsertGroupMessage(*StoredGroupMessage) error
+		// InsertPrivateMessage 向数据库写入新的私聊消息
+		InsertPrivateMessage(*StoredPrivateMessage) error
+	}
+
+	IStoredMessage interface {
+		GetID() string
+		GetType() string
+		GetGlobalID() int32
+		GetAttribute() *StoredMessageAttribute
+		GetContent() []global.MSG
+	}
+
+	// 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"`
+	}
+
+	// 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"`
+	}
+
+	// StoredMessageAttribute 持久化消息属性
+	StoredMessageAttribute struct {
+		MessageSeq int32  `bson:"messageSeq"`
+		InternalID int32  `bson:"internalId"`
+		SenderUin  int64  `bson:"senderUin"`
+		SenderName string `bson:"senderName"`
+		Timestamp  int64  `bson:"timestamp"`
+	}
+
+	// QuotedInfo 引用回复
+	QuotedInfo struct {
+		PrevID        string       `bson:"prevId"`
+		PrevGlobalID  int32        `bson:"prevGlobalId"`
+		QuotedContent []global.MSG `bson:"quotedContent"`
+	}
+)
+
+// ToGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
+func ToGlobalID(code int64, msgID int32) int32 {
+	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
+}
+
+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.go

@@ -0,0 +1,118 @@
+package db
+
+import (
+	"bytes"
+	"encoding/gob"
+	"path"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/pkg/errors"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type LevelDBImpl struct {
+	db *leveldb.DB
+}
+
+const (
+	group   byte = 0x0
+	private byte = 0x1
+)
+
+func UseLevelDB() *LevelDBImpl {
+	gob.Register(StoredMessageAttribute{})
+	gob.Register(QuotedInfo{})
+	gob.Register(global.MSG{})
+	gob.Register(StoredGroupMessage{})
+	gob.Register(StoredPrivateMessage{})
+	return &LevelDBImpl{}
+}
+
+func (db *LevelDBImpl) Open() error {
+	p := path.Join("data", "leveldb-v2")
+	d, err := leveldb.OpenFile(p, &opt.Options{
+		WriteBuffer: 128 * opt.KiB,
+	})
+	if err != nil {
+		return errors.Wrap(err, "open level db error")
+	}
+	db.db = d
+	return nil
+}
+
+func (db *LevelDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
+	v, err := db.db.Get(binary.ToBytes(id), nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "get value error")
+	}
+	r := binary.NewReader(v)
+	switch r.ReadByte() {
+	case group:
+		g := &StoredGroupMessage{}
+		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(g); err != nil {
+			return nil, errors.Wrap(err, "decode message error")
+		}
+		return g, nil
+	case private:
+		p := &StoredPrivateMessage{}
+		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(p); err != nil {
+			return nil, errors.Wrap(err, "decode message error")
+		}
+		return p, nil
+	default:
+		return nil, errors.New("unknown message flag")
+	}
+}
+
+func (db *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
+	i, err := db.GetMessageByGlobalID(id)
+	if err != nil {
+		return nil, err
+	}
+	g, ok := i.(*StoredGroupMessage)
+	if !ok {
+		return nil, errors.New("message type error")
+	}
+	return g, nil
+}
+
+func (db *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
+	i, err := db.GetMessageByGlobalID(id)
+	if err != nil {
+		return nil, err
+	}
+	p, ok := i.(*StoredPrivateMessage)
+	if !ok {
+		return nil, errors.New("message type error")
+	}
+	return p, nil
+}
+
+func (db *LevelDBImpl) InsertGroupMessage(msg *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 := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
+		w.WriteByte(group)
+		w.Write(buf.Bytes())
+	}), nil)
+	return errors.Wrap(err, "put data error")
+}
+
+func (db *LevelDBImpl) InsertPrivateMessage(msg *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 := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
+		w.WriteByte(private)
+		w.Write(buf.Bytes())
+	}), nil)
+	return errors.Wrap(err, "put data error")
+}

db/mongodb.go

@@ -0,0 +1,71 @@
+package db
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+type MongoDBImpl struct {
+	uri   string
+	db    string
+	mongo *mongo.Database
+}
+
+const (
+	MongoGroupMessageCollection   = "group-messages"
+	MongoPrivateMessageCollection = "private-messages"
+)
+
+func UseMongoDB(uri, db string) *MongoDBImpl {
+	return &MongoDBImpl{uri: uri, db: db}
+}
+
+func (db *MongoDBImpl) Open() error {
+	cli, err := mongo.Connect(context.Background(), options.Client().ApplyURI(db.uri))
+	if err != nil {
+		return errors.Wrap(err, "open mongo connection error")
+	}
+	db.mongo = cli.Database(db.db)
+	return nil
+}
+
+func (db *MongoDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
+	if r, err := db.GetGroupMessageByGlobalID(id); err == nil {
+		return r, nil
+	}
+	return db.GetPrivateMessageByGlobalID(id)
+}
+
+func (db *MongoDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
+	coll := db.mongo.Collection(MongoGroupMessageCollection)
+	var ret StoredGroupMessage
+	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	return &ret, nil
+}
+
+func (db *MongoDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
+	coll := db.mongo.Collection(MongoPrivateMessageCollection)
+	var ret StoredPrivateMessage
+	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	return &ret, nil
+}
+
+func (db *MongoDBImpl) InsertGroupMessage(msg *StoredGroupMessage) error {
+	coll := db.mongo.Collection(MongoGroupMessageCollection)
+	_, err := coll.InsertOne(context.Background(), msg)
+	return errors.Wrap(err, "insert error")
+}
+
+func (db *MongoDBImpl) InsertPrivateMessage(msg *StoredPrivateMessage) error {
+	coll := db.mongo.Collection(MongoPrivateMessageCollection)
+	_, err := coll.InsertOne(context.Background(), msg)
+	return errors.Wrap(err, "insert error")
+}

db/multidb.go

@@ -0,0 +1,68 @@
+package db
+
+import "github.com/pkg/errors"
+
+// MultiDBImpl 多数据库支持
+// 写入会对所有 Backend 进行写入
+// 读取只会读取第一个库
+type MultiDBImpl struct {
+	backends []IDatabase
+}
+
+func NewMultiDatabase(backends ...IDatabase) *MultiDBImpl {
+	return &MultiDBImpl{
+		backends: backends,
+	}
+}
+
+func (db *MultiDBImpl) UseDB(backend IDatabase) {
+	db.backends = append(db.backends, backend)
+}
+
+func (db *MultiDBImpl) Open() error {
+	for _, b := range db.backends {
+		if err := b.Open(); err != nil {
+			return errors.Wrap(err, "open backend error")
+		}
+	}
+	return nil
+}
+
+func (db *MultiDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
+	if len(db.backends) == 0 {
+		return nil, errors.New("database disabled")
+	}
+	return db.backends[0].GetMessageByGlobalID(id)
+}
+
+func (db *MultiDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
+	if len(db.backends) == 0 {
+		return nil, errors.New("database disabled")
+	}
+	return db.backends[0].GetGroupMessageByGlobalID(id)
+}
+
+func (db *MultiDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
+	if len(db.backends) == 0 {
+		return nil, errors.New("database disabled")
+	}
+	return db.backends[0].GetPrivateMessageByGlobalID(id)
+}
+
+func (db *MultiDBImpl) InsertGroupMessage(m *StoredGroupMessage) error {
+	for _, b := range db.backends {
+		if err := b.InsertGroupMessage(m); err != nil {
+			return errors.Wrap(err, "insert message to backend error")
+		}
+	}
+	return nil
+}
+
+func (db *MultiDBImpl) InsertPrivateMessage(m *StoredPrivateMessage) error {
+	for _, b := range db.backends {
+		if err := b.InsertPrivateMessage(m); err != nil {
+			return errors.Wrap(err, "insert message to backend error")
+		}
+	}
+	return nil
+}

docs/config.md

@@ -32,7 +32,6 @@ heartbeat:
   # -1 为关闭心跳
   interval: 5
 
-message:
   # 上报数据类型
   # 可选: string,array
   post-format: string
@@ -48,6 +47,12 @@ message:
   proxy-rewrite: ''
   # 是否上报自身消息
   report-self-message: false
+  # 移除服务端的Reply附带的At
+  remove-reply-at: false
+  # 为Reply附加更多信息
+  extra-reply-data: false
+  # 跳过 Mime 扫描, 忽略错误数据
+  skip-mime-scan: false
 
 output:
   # 日志等级 trace,debug,info,warn,error
@@ -149,6 +154,8 @@ database: # 数据库相关设置
 
 > 注4：关闭心跳服务可能引起断线，请谨慎关闭
 
+> 注5：关于MIME扫描， 详见[MIME](file.md#MIME)
+
 ## 在线状态
 
 | 状态 | 值 |
@@ -222,7 +229,7 @@ database: # 数据库相关设置
 在部署前，请在本地完成登录，并将 `config.yml` ， `device.json` ，`bootstrap` 和 `go-cqhttp`
 一起打包。
 
-在触发器中创建一个API网关触发器，并启用继承响应， 创建完成后即可通过api网关访问go-cqhttp(建议配置 AccessToken)。
+在触发器中创建一个API网关触发器，并启用集成响应，创建完成后即可通过api网关访问go-cqhttp(建议配置 AccessToken)。
 
 > scripts/bootstrap 中使用的工作路径为 /tmp, 这个目录最大能容下500M文件, 如需长期使用，
 > 请挂载文件存储(CFS).

docs/cqhttp.md

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

docs/file.md

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

docs/slider.md

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

global/all_test.go

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

global/codec.go

@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"path"
 
-	"github.com/Mrs4s/go-cqhttp/global/codec"
-
 	"github.com/pkg/errors"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 )
 
 // EncoderSilk 将音频编码为Silk
@@ -23,7 +23,7 @@ func EncoderSilk(data []byte) ([]byte, error) {
 	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
 		return os.ReadFile(silkPath)
 	}
-	slk, err := codec.EncodeToSilk(data, tempName, true)
+	slk, err := base.EncodeSilk(data, tempName)
 	if err != nil {
 		return nil, errors.Wrap(err, "encode silk failed")
 	}

global/codec/codec_unsupportedarch.go

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

global/codec/codec_unsupportedos.go

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

global/codec/codec_windows_arm.go

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

global/codec/doc.go

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

global/fs.go

@@ -3,7 +3,6 @@ package global
 import (
 	"bytes"
 	"crypto/md5"
-	"encoding/base64"
 	"encoding/hex"
 	"errors"
 	"net"
@@ -16,6 +15,8 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/utils"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/internal/param"
 )
 
 const (
@@ -45,7 +46,7 @@ var (
 // PathExists 判断给定path是否存在
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
-	return err == nil || os.IsExist(err)
+	return err == nil || errors.Is(err, os.ErrExist)
 }
 
 // ReadAllText 读取给定path对应文件，无法读取时返回空值
@@ -98,7 +99,7 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 			return nil, err
 		}
 	case strings.HasPrefix(file, "base64"):
-		data, err = base64.StdEncoding.DecodeString(strings.TrimPrefix(file, "base64://"))
+		data, err = param.Base64DecodeString(strings.TrimPrefix(file, "base64://"))
 		if err != nil {
 			return nil, err
 		}

global/log_hook.go

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

global/net.go

@@ -12,22 +12,22 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
-	"github.com/guonaihong/gout"
 	"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 Proxy == "" {
+				if base.Proxy == "" {
 					return http.ProxyFromEnvironment(request)
 				}
-				return url.Parse(Proxy)
+				return url.Parse(base.Proxy)
 			},
 			ForceAttemptHTTP2:   true,
 			MaxConnsPerHost:     0,
@@ -36,9 +36,6 @@ var (
 		},
 	}
 
-	// Proxy 存储Config.proxy_rewrite,用于设置代理
-	Proxy string
-
 	// ErrOverSize 响应主体过大时返回此错误
 	ErrOverSize = errors.New("oversize")
 
@@ -249,22 +246,6 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	return lastErr
 }
 
-// GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
-func GetSliderTicket(raw, id string) (string, error) {
-	var rsp string
-	if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
-		"id":  id,
-		"url": raw,
-	}).SetTimeout(time.Second * 35).BindBody(&rsp).Do(); err != nil {
-		return "", err
-	}
-	g := gjson.Parse(rsp)
-	if g.Get("error").Str != "" {
-		return "", errors.New(g.Get("error").Str)
-	}
-	return g.Get("ticket").Str, nil
-}
-
 // 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}}`)

global/param.go

@@ -1,58 +1,14 @@
 package global
 
 import (
-	"math"
-	"reflect"
 	"regexp"
 	"strconv"
-	"strings"
-	"sync"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 )
 
-// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
-//
-// 支持的合法类型有
-//
-// type bool
-//
-// type gjson.True or gjson.False
-//
-// type string "true","yes","1" or "false","no","0" (case insensitive)
-func EnsureBool(p interface{}, defaultVal bool) bool {
-	var str string
-	if b, ok := p.(bool); ok {
-		return b
-	}
-	if j, ok := p.(gjson.Result); ok {
-		if !j.Exists() {
-			return defaultVal
-		}
-		switch j.Type { // nolint
-		case gjson.True:
-			return true
-		case gjson.False:
-			return false
-		case gjson.String:
-			str = j.Str
-		default:
-			return defaultVal
-		}
-	} else if s, ok := p.(string); ok {
-		str = s
-	}
-	str = strings.ToLower(str)
-	switch str {
-	case "true", "yes", "1":
-		return true
-	case "false", "no", "0":
-		return false
-	default:
-		return defaultVal
-	}
-}
+// MSG 消息Map
+type MSG map[string]interface{}
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
 //
@@ -88,65 +44,3 @@ func VersionNameCompare(current, remote string) bool {
 	}
 	return cur[4] < re[4]
 }
-
-// SetAtDefault 在变量 variable 为默认值 defaultValue 的时候修改为 value
-func SetAtDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	if v.Elem().Interface() != defaultValue {
-		return
-	}
-	if v.Elem().Kind() != v2.Kind() {
-		return
-	}
-	v.Elem().Set(v2)
-}
-
-// SetExcludeDefault 在目标值 value 不为默认值 defaultValue 时修改 variable 为 value
-func SetExcludeDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	if v2.Elem().Interface() != defaultValue {
-		return
-	}
-	if v.Elem().Kind() != v2.Kind() {
-		return
-	}
-	v.Elem().Set(v2)
-}
-
-var (
-	// once lazy compile the reg
-	once sync.Once
-	// reg is splitURL regex pattern.
-	reg *regexp.Regexp
-)
-
-// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
-func SplitURL(s string) []string {
-	once.Do(func() { // lazy init.
-		reg = regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
-	})
-	idx := reg.FindAllStringIndex(s, -1)
-	if len(idx) == 0 {
-		return []string{s}
-	}
-	var result []string
-	last := 0
-	for i := 0; i < len(idx); i++ {
-		if len(idx[i]) != 2 {
-			continue
-		}
-		m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
-		result = append(result, s[last:m])
-		last = m
-	}
-	result = append(result, s[last:])
-	return result
-}

global/signal_windows.go

@@ -18,11 +18,9 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var (
-	validTasks = map[string]func(){
-		"dumpstack": dumpStack,
-	}
-)
+var validTasks = map[string]func(){
+	"dumpstack": dumpStack,
+}
 
 // SetupMainSignalHandler is for main to use at last
 func SetupMainSignalHandler() <-chan struct{} {

global/terminal/double_click.go

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

global/terminal/double_click_windows.go

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

global/update/update.go

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

go.mod

@@ -1,36 +1,62 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.16
+go 1.17
+
+replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0
 
 require (
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
 	github.com/Microsoft/go-winio v0.5.0
-	github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e
+	github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82
 	github.com/dustin/go-humanize v1.0.0
-	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/fumiama/go-hide-param v0.1.4
+	github.com/gabriel-vasile/mimetype v1.3.1
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.2.1
-	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/json-iterator/go v1.1.11
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.4 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/errors v0.9.1
+	github.com/segmentio/asm v1.0.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.8.1
 	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	github.com/willf/bitset v1.2.0 // indirect
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
+	go.mongodb.org/mongo-driver v1.7.2
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
-	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
-replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/klauspost/compress v1.9.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
+	github.com/lestrrat-go/strftime v1.0.5 // indirect
+	github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
+	github.com/tidwall/match v1.0.3 // indirect
+	github.com/tidwall/pretty v1.1.0 // indirect
+	github.com/willf/bitset v1.2.0 // indirect
+	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/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	modernc.org/libc v1.8.1 // indirect
+	modernc.org/mathutil v1.2.2 // indirect
+	modernc.org/memory v1.0.4 // indirect
+)

go.sum

@@ -4,8 +4,8 @@ github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/g
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
 github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e h1:PgFshw1L5TVdiDRLgr/bSotPGaGXYzbtn5cDBBvpL6U=
-github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q=
+github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E=
+github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww=
 github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -18,84 +18,106 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/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/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
 github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.0 h1:Lb3veSYoGaNck69fV2+Vf2juLSsHpMTf3Vk5+X+EDJg=
-github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 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/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.2.1 h1:XnaS92y/Mpcu4MOQU5cx4hTKhbqFznbIE/uUI5sMY9E=
-github.com/guonaihong/gout v0.2.1/go.mod h1:JkjNv1G2oRWvFgP/r4DUbYhoeIBB0zMP2j1ID+5CYpU=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M=
+github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
+github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+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/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=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
-github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE=
+github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
 github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 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/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -104,43 +126,58 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/segmentio/asm v1.0.0 h1:GMF7/2eLkte13LERSOmPI766AJXJDRlsqqiN8T7Mfmk=
+github.com/segmentio/asm v1.0.0/go.mod h1:4EUJGaKsB8ImLUwOGORVsNd9vTRDeh44JGsY4aKp5I4=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.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/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
 github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
 github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
 github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 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/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.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg=
+go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -149,19 +186,28 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/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/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -175,17 +221,21 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 h1:Vv0JUPWTyeqUq42B2WJ1FeIDjjvGKoA2Ss+Ts0lAVbs=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -203,18 +253,19 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/base/feature.go

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

internal/base/flag.go

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

internal/base/version.go

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

internal/btree/btree.go

@@ -0,0 +1,524 @@
+// 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()
+}
+
+// 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
+	}
+
+	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]
+}
+
+// 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
+}

internal/btree/btree_test.go

@@ -0,0 +1,61 @@
+package btree
+
+import (
+	"crypto/sha1"
+	"os"
+	"testing"
+
+	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)
+	assert2.NoError(t, err)
+
+	var tests = []string{
+		"hello world",
+		"123",
+		"We are met on a great battle-field of that war.",
+		"Abraham Lincoln, November 19, 1863, Gettysburg, Pennsylvania",
+	}
+	var sha = make([]*byte, len(tests))
+	for i, tt := range tests {
+		var hash = sha1.New()
+		hash.Write([]byte(tt))
+		sha[i] = &hash.Sum(nil)[0]
+		bt.Insert(sha[i], []byte(tt))
+	}
+	assert2.NoError(t, bt.Close())
+
+	bt, err = Open(f)
+	assert2.NoError(t, err)
+	for i, tt := range tests {
+		assert2.Equal(t, []byte(tt), bt.Get(sha[i]))
+	}
+
+	for i := range tests {
+		assert2.NoError(t, bt.Delete(sha[i]))
+	}
+
+	for i := range tests {
+		assert2.Equal(t, []byte(nil), bt.Get(sha[i]))
+	}
+
+	assert2.NoError(t, bt.Close())
+}

internal/btree/chunk.go

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

@@ -0,0 +1,106 @@
+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) {
+	var 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

@@ -0,0 +1,97 @@
+// Package cache impl the cache for gocq
+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"
+)
+
+// todo(wdvxdr): always enable db-cache in v1.0.0
+
+// EnableCacheDB 是否启用 btree db缓存图片等
+var EnableCacheDB bool
+
+// Media Cache DBs
+var (
+	Image Cache
+	Video Cache
+	// todo: Voice?
+)
+
+// Cache wraps the btree.DB for concurrent safe
+type Cache struct {
+	lock sync.RWMutex
+	db   *btree.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)
+}
+
+// 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])
+}
+
+// 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])
+}
+
+// Init 初始化 Cache
+func Init() {
+	node, ok := base.Database["cache"]
+	if !ok {
+		return
+	}
+	EnableCacheDB = true
+	var conf map[string]string
+	err := node.Decode(&conf)
+	if err != nil {
+		log.Fatalf("failed to read cache config: %v", err)
+	}
+
+	var 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)
+}

internal/param/param.go

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

internal/selfupdate/update.go

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

internal/selfupdate/update_others.go

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

internal/selfupdate/update_windows.go

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

login.go

@@ -18,13 +18,13 @@ import (
 
 var console = bufio.NewReader(os.Stdin)
 
-var readLine = func() (str string) {
+func readLine() (str string) {
 	str, _ = console.ReadString('\n')
 	str = strings.TrimSpace(str)
 	return
 }
 
-var readLineTimeout = func(t time.Duration, de string) (str string) {
+func readLineTimeout(t time.Duration, de string) (str string) {
 	r := make(chan string)
 	go func() {
 		select {
@@ -117,21 +117,7 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		var text string
 		switch res.Error {
 		case client.SliderNeededError:
-			log.Warnf("登录需要滑条验证码. ")
-			log.Warnf("请参考文档 -> https://docs.go-cqhttp.org/faq/slider.html <- 进行处理")
-			log.Warnf("1. 自行抓包并获取 Ticket 输入.")
-			log.Warnf("2. 使用手机QQ扫描二维码登入. (推荐)")
-			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
-			text = readLineTimeout(time.Second*10, "2")
-			if strings.Contains(text, "1") {
-				println()
-				log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
-				println()
-				log.Warn("请输入Ticket： (Enter 提交)")
-				text = readLine()
-				res, err = cli.SubmitTicket(text)
-				continue
-			}
+			log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
 			cli.Disconnect()
 			cli.Release()
 			cli = client.NewClientEmpty()

main.go

@@ -1,108 +1,70 @@
 package main
 
 import (
-	"bufio"
 	"crypto/aes"
 	"crypto/md5"
 	"crypto/sha1"
 	"encoding/hex"
-	"flag"
-	"fmt"
 	"os"
-	"os/exec"
 	"path"
-	"path/filepath"
-	"runtime"
-	"strings"
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
-	"github.com/Mrs4s/go-cqhttp/global/terminal"
-	"github.com/Mrs4s/go-cqhttp/global/update"
-	"github.com/Mrs4s/go-cqhttp/server"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/guonaihong/gout"
+	para "github.com/fumiama/go-hide-param"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	log "github.com/sirupsen/logrus"
-	easy "github.com/t-tomalak/logrus-easy-formatter"
-	"github.com/tidwall/gjson"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/term"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
+	"github.com/Mrs4s/go-cqhttp/modules/servers"
+	"github.com/Mrs4s/go-cqhttp/server"
+
+	_ "github.com/Mrs4s/go-cqhttp/modules/mime" // mime检查模块
+	_ "github.com/Mrs4s/go-cqhttp/modules/silk" // silk编码模块
 )
 
-var (
-	conf        *config.Config
-	isFastStart = false
-	// PasswordHash 存储QQ密码哈希供登录使用
-	PasswordHash [16]byte
-
-	// AccountToken 存储AccountToken供登录使用
-	AccountToken []byte
-
-	// 允许通过配置文件设置的状态列表
-	allowStatus = [...]client.UserOnlineStatus{
-		client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
-		client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
-		client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
-		client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
-		client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
-	}
-)
+// 允许通过配置文件设置的状态列表
+var allowStatus = [...]client.UserOnlineStatus{
+	client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
+	client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
+	client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
+	client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
+	client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
+}
 
 func main() {
-	c := flag.String("c", config.DefaultConfigFile, "configuration filename default is config.hjson")
-	d := flag.Bool("d", false, "running as a daemon")
-	h := flag.Bool("h", false, "this help")
-	wd := flag.String("w", "", "cover the working directory")
-	debug := flag.Bool("D", false, "debug mode")
-	flag.Parse()
-
+	base.Parse()
 	switch {
-	case *h:
-		help()
-	case *d:
+	case base.LittleH:
+		base.Help()
+	case base.LittleD:
 		server.Daemon()
-	case *wd != "":
-		resetWorkDir(*wd)
+	case base.LittleWD != "":
+		base.ResetWorkingDir()
 	}
+	base.Init()
 
-	// 通过-c 参数替换 配置文件路径
-	config.DefaultConfigFile = *c
-	conf = config.Get()
-	if *debug {
-		conf.Output.Debug = true
-	}
-	if conf.Output.Debug {
-		log.SetReportCaller(true)
-	}
-
-	logFormatter := &easy.Formatter{
-		TimestampFormat: "2006-01-02 15:04:05",
-		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
-	}
 	rotateOptions := []rotatelogs.Option{
 		rotatelogs.WithRotationTime(time.Hour * 24),
 	}
-
-	if conf.Output.LogAging > 0 {
-		rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(time.Hour*24*time.Duration(conf.Output.LogAging)))
-	}
-	if conf.Output.LogForceNew {
+	rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(base.LogAging))
+	if base.LogForceNew {
 		rotateOptions = append(rotateOptions, rotatelogs.ForceNewFile())
 	}
-
 	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotateOptions...)
 	if err != nil {
 		log.Errorf("rotatelogs init err: %v", err)
 		panic(err)
 	}
-
-	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...))
+	log.AddHook(global.NewLocalHook(w, global.LogFormat{}, global.GetLogLevel(base.LogLevel)...))
 
 	mkCacheDir := func(path string, _type string) {
 		if !global.PathExists(path) {
@@ -115,6 +77,7 @@ func main() {
 	mkCacheDir(global.VoicePath, "语音")
 	mkCacheDir(global.VideoPath, "视频")
 	mkCacheDir(global.CachePath, "发送图片")
+	cache.Init()
 
 	var byteKey []byte
 	arg := os.Args
@@ -123,36 +86,43 @@ func main() {
 			switch arg[i] {
 			case "update":
 				if len(arg) > i+1 {
-					selfUpdate(arg[i+1])
+					selfupdate.SelfUpdate(arg[i+1])
 				} else {
-					selfUpdate("")
+					selfupdate.SelfUpdate("")
 				}
 			case "key":
-				if len(arg) > i+1 {
-					byteKey = []byte(arg[i+1])
+				p := i + 1
+				if len(arg) > p {
+					byteKey = []byte(arg[p])
+					para.Hide(p)
 				}
 			case "faststart":
-				isFastStart = true
+				base.FastStart = true
 			}
 		}
 	}
-	if terminal.RunningByDoubleClick() && !isFastStart {
-		log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
-		log.Warning("将等待10s后启动")
-		time.Sleep(time.Second * 10)
+
+	if !base.FastStart && terminal.RunningByDoubleClick() {
+		err := terminal.NoMoreDoubleClick()
+		if err != nil {
+			log.Errorf("遇到错误: %v", err)
+			time.Sleep(time.Second * 5)
+		}
+		return
 	}
 
-	if (conf.Account.Uin == 0 || (conf.Account.Password == "" && !conf.Account.Encrypt)) && !global.PathExists("session.token") {
+	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
 		log.Warn("账号密码未配置, 将使用二维码登录.")
-		if !isFastStart {
+		if !base.FastStart {
 			log.Warn("将在 5秒 后继续.")
 			time.Sleep(time.Second * 5)
 		}
 	}
 
-	log.Info("当前版本:", coolq.Version)
-	if conf.Output.Debug {
+	log.Info("当前版本:", base.Version)
+	if base.Debug {
 		log.SetLevel(log.DebugLevel)
+		log.SetReportCaller(true)
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
 	}
@@ -169,22 +139,22 @@ func main() {
 		}
 	}
 
-	if conf.Account.Encrypt {
+	if base.Account.Encrypt {
 		if !global.PathExists("password.encrypt") {
-			if conf.Account.Password == "" {
+			if base.Account.Password == "" {
 				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
 				readLine()
 				os.Exit(0)
 			}
 			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
 			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			PasswordHash = md5.Sum([]byte(conf.Account.Password))
-			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(PasswordHash[:], byteKey)), 0o644)
+			base.PasswordHash = md5.Sum([]byte(base.Account.Password))
+			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
 			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 			readLine()
 			os.Exit(0)
 		} else {
-			if conf.Account.Password != "" {
+			if base.Account.Password != "" {
 				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 				readLine()
 				os.Exit(0)
@@ -216,12 +186,12 @@ func main() {
 			if err != nil {
 				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
 			}
-			copy(PasswordHash[:], ph)
+			copy(base.PasswordHash[:], ph)
 		}
-	} else {
-		PasswordHash = md5.Sum([]byte(conf.Account.Password))
+	} else if len(base.Account.Password) > 0 {
+		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 	}
-	if !isFastStart {
+	if !base.FastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
 		time.Sleep(time.Second * 5)
 	}
@@ -242,27 +212,27 @@ func main() {
 		return "未知"
 	}())
 	cli = newClient()
-	global.Proxy = conf.Message.ProxyRewrite
-	isQRCodeLogin := (conf.Account.Uin == 0 || len(conf.Account.Password) == 0) && !conf.Account.Encrypt
+	isQRCodeLogin := (base.Account.Uin == 0 || len(base.Account.Password) == 0) && !base.Account.Encrypt
 	isTokenLogin := false
 	saveToken := func() {
-		AccountToken = cli.GenToken()
-		_ = os.WriteFile("session.token", AccountToken, 0o644)
+		base.AccountToken = cli.GenToken()
+		_ = os.WriteFile("session.token", base.AccountToken, 0o644)
 	}
 	if global.PathExists("session.token") {
 		token, err := os.ReadFile("session.token")
 		if err == nil {
-			if conf.Account.Uin != 0 {
+			if base.Account.Uin != 0 {
 				r := binary.NewReader(token)
 				cu := r.ReadInt64()
-				if cu != conf.Account.Uin {
-					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", conf.Account.Uin, cu)
+				if cu != base.Account.Uin {
+					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
 					log.Warnf("1. 使用会话缓存继续.")
 					log.Warnf("2. 删除会话缓存并重启.")
 					log.Warnf("请选择: (5秒后自动选1)")
 					text := readLineTimeout(time.Second*5, "1")
 					if text == "2" {
 						_ = os.Remove("session.token")
+						log.Infof("缓存已删除.")
 						os.Exit(0)
 					}
 				}
@@ -279,9 +249,9 @@ func main() {
 			}
 		}
 	}
-	if conf.Account.Uin != 0 && PasswordHash != [16]byte{} {
-		cli.Uin = conf.Account.Uin
-		cli.PasswordMd5 = PasswordHash
+	if base.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
+		cli.Uin = base.Account.Uin
+		cli.PasswordMd5 = base.PasswordHash
 	}
 	if !isTokenLogin {
 		if !isQRCodeLogin {
@@ -304,23 +274,28 @@ func main() {
 			return
 		}
 		log.Warnf("Bot已离线: %v", e.Message)
-		time.Sleep(time.Second * time.Duration(conf.Account.ReLogin.Delay))
+		time.Sleep(time.Second * time.Duration(base.Reconnect.Delay))
 		for {
-			if conf.Account.ReLogin.Disabled {
+			if base.Reconnect.Disabled {
+				log.Warnf("未启用自动重连, 将退出.")
 				os.Exit(1)
 			}
-			if times > conf.Account.ReLogin.MaxTimes && conf.Account.ReLogin.MaxTimes != 0 {
+			if times > base.Reconnect.MaxTimes && base.Reconnect.MaxTimes != 0 {
 				log.Fatalf("Bot重连次数超过限制, 停止")
 			}
 			times++
-			if conf.Account.ReLogin.Interval > 0 {
-				log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.Account.ReLogin.Interval, times, conf.Account.ReLogin.MaxTimes)
-				time.Sleep(time.Second * time.Duration(conf.Account.ReLogin.Interval))
+			if base.Reconnect.Interval > 0 {
+				log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", base.Reconnect.Interval, times, base.Reconnect.MaxTimes)
+				time.Sleep(time.Second * time.Duration(base.Reconnect.Interval))
 			} else {
 				time.Sleep(time.Second)
 			}
+			if cli.Online {
+				log.Infof("登录已完成")
+				break
+			}
 			log.Warnf("尝试重连...")
-			err := cli.TokenLogin(AccountToken)
+			err := cli.TokenLogin(base.AccountToken)
 			if err == nil {
 				saveToken()
 				return
@@ -348,70 +323,16 @@ func main() {
 	log.Infof("开始加载群列表...")
 	global.Check(cli.ReloadGroupList(), true)
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if conf.Account.Status >= int32(len(allowStatus)) || conf.Account.Status < 0 {
-		conf.Account.Status = 0
-	}
-	cli.SetOnlineStatus(allowStatus[int(conf.Account.Status)])
-	bot := coolq.NewQQBot(cli, conf)
-	_ = bot.Client
-	if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
-		log.Warnf("post-format 配置错误, 将自动使用 string")
-		coolq.SetMessageFormat("string")
-	} else {
-		coolq.SetMessageFormat(conf.Message.PostFormat)
-	}
-	coolq.IgnoreInvalidCQCode = conf.Message.IgnoreInvalidCQCode
-	coolq.SplitURL = conf.Message.FixURL
-	coolq.ForceFragmented = conf.Message.ForceFragment
-	coolq.RemoveReplyAt = conf.Message.RemoveReplyAt
-	coolq.ExtraReplyData = conf.Message.ExtraReplyData
-	coolq.SkipMimeScan = conf.Message.SkipMimeScan
-	for _, m := range conf.Servers {
-		if h, ok := m["http"]; ok {
-			hc := new(config.HTTPServer)
-			if err := h.Decode(hc); err != nil {
-				log.Warn("读取http配置失败 :", err)
-			} else {
-				go server.RunHTTPServerAndClients(bot, hc)
-			}
-		}
-		if s, ok := m["ws"]; ok {
-			sc := new(config.WebsocketServer)
-			if err := s.Decode(sc); err != nil {
-				log.Warn("读取正向Websocket配置失败 :", err)
-			} else {
-				go server.RunWebSocketServer(bot, sc)
-			}
-		}
-		if c, ok := m["ws-reverse"]; ok {
-			rc := new(config.WebsocketReverse)
-			if err := c.Decode(rc); err != nil {
-				log.Warn("读取反向Websocket配置失败 :", err)
-			} else {
-				go server.RunWebSocketClient(bot, rc)
-			}
-		}
-		if p, ok := m["pprof"]; ok {
-			pc := new(config.PprofServer)
-			if err := p.Decode(pc); err != nil {
-				log.Warn("读取pprof配置失败 :", err)
-			} else {
-				go server.RunPprofServer(pc)
-			}
-		}
-		if p, ok := m["lambda"]; ok {
-			lc := new(config.LambdaServer)
-			if err := p.Decode(lc); err != nil {
-				log.Warn("读取pprof配置失败 :", err)
-			} else {
-				go server.RunLambdaClient(bot, lc)
-			}
-		}
+	if uint(base.Account.Status) >= uint(len(allowStatus)) {
+		base.Account.Status = 0
 	}
+	cli.SetOnlineStatus(allowStatus[base.Account.Status])
+
+	servers.Run(coolq.NewQQBot(cli))
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 
-	go checkUpdate()
+	go selfupdate.CheckUpdate()
 
 	<-global.SetupMainSignalHandler()
 }
@@ -447,178 +368,10 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 	return result, nil
 }
 
-func checkUpdate() {
-	log.Infof("正在检查更新.")
-	if coolq.Version == "(devel)" {
-		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
-		return
-	}
-	var res string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest").BindBody(&res).Do(); err != nil {
-		log.Warnf("检查更新失败: %v", err)
-		return
-	}
-	info := gjson.Parse(res)
-	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
-		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
-		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
-		return
-	}
-	log.Infof("检查更新完成. 当前已运行最新版本.")
-}
-
-func selfUpdate(imageURL string) {
-	log.Infof("正在检查更新.")
-	var res, r string
-	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest").BindBody(&res).Do(); err != nil {
-		log.Warnf("检查更新失败: %v", err)
-		return
-	}
-	info := gjson.Parse(res)
-	version := info.Get("tag_name").Str
-	if coolq.Version == version {
-		log.Info("当前版本已经是最新版本!")
-		goto wait
-	}
-	log.Info("当前最新版本为 ", version)
-	log.Warn("是否更新(y/N): ")
-	r = strings.TrimSpace(readLine())
-	if r != "y" && r != "Y" {
-		log.Warn("已取消更新！")
-	} else {
-		log.Info("正在更新,请稍等...")
-		sumURL := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp_checksums.txt",
-			func() string {
-				if imageURL != "" {
-					return imageURL
-				}
-				return "https://github.com"
-			}(), version)
-		closer, err := global.HTTPGetReadCloser(sumURL)
-		if err != nil {
-			log.Error("更新失败: ", err)
-			goto wait
-		}
-		rd := bufio.NewReader(closer)
-		binaryName := fmt.Sprintf("go-cqhttp_%v_%v.%v", runtime.GOOS, func() string {
-			if runtime.GOARCH == "arm" {
-				return "armv7"
-			}
-			return runtime.GOARCH
-		}(), func() string {
-			if runtime.GOOS == "windows" {
-				return "zip"
-			}
-			return "tar.gz"
-		}())
-		var sum []byte
-		for {
-			str, err := rd.ReadString('\n')
-			if err != nil {
-				break
-			}
-			str = strings.TrimSpace(str)
-			if strings.HasSuffix(str, binaryName) {
-				sum, _ = hex.DecodeString(strings.TrimSuffix(str, "  "+binaryName))
-				break
-			}
-		}
-		url := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/%v",
-			func() string {
-				if imageURL != "" {
-					return imageURL
-				}
-				return "https://github.com"
-			}(), version, binaryName)
-
-		err = update.Update(url, sum)
-		if err != nil {
-			log.Error("更新失败: ", err)
-		} else {
-			log.Info("更新成功!")
-		}
-	}
-wait:
-	log.Info("按 Enter 继续....")
-	readLine()
-	os.Exit(0)
-}
-
-/*
-func restart(args []string) {
-	var cmd *exec.Cmd
-	if runtime.GOOS == "windows" {
-		file, err := exec.LookPath(args[0])
-		if err != nil {
-			log.Errorf("重启失败:%s", err.Error())
-			return
-		}
-		path, err := filepath.Abs(file)
-		if err != nil {
-			log.Errorf("重启失败:%s", err.Error())
-		}
-		args = append([]string{"/c", "start ", path, "faststart"}, args[1:]...)
-		cmd = &exec.Cmd{
-			Path:   "cmd.exe",
-			Args:   args,
-			Stderr: os.Stderr,
-			Stdout: os.Stdout,
-		}
-	} else {
-		args = append(args, "faststart")
-		cmd = &exec.Cmd{
-			Path:   args[0],
-			Args:   args,
-			Stderr: os.Stderr,
-			Stdout: os.Stdout,
-		}
-	}
-	_ = cmd.Start()
-}
-*/
-
-// help cli命令行-h的帮助提示
-func help() {
-	fmt.Printf(`go-cqhttp service
-version: %s
-
-Usage:
-
-server [OPTIONS]
-
-Options:
-`, coolq.Version)
-
-	flag.PrintDefaults()
-	os.Exit(0)
-}
-
-func resetWorkDir(wd string) {
-	args := make([]string, 0, len(os.Args))
-	for i := 1; i < len(os.Args); i++ {
-		if os.Args[i] == "-w" {
-			i++ // skip value field
-		} else if !strings.HasPrefix(os.Args[i], "-w") {
-			args = append(args, os.Args[i])
-		}
-	}
-	p, _ := filepath.Abs(os.Args[0])
-	proc := exec.Command(p, args...)
-	proc.Stdin = os.Stdin
-	proc.Stdout = os.Stdout
-	proc.Stderr = os.Stderr
-	proc.Dir = wd
-	err := proc.Run()
-	if err != nil {
-		panic(err)
-	}
-	os.Exit(0)
-}
-
 func newClient() *client.QQClient {
 	c := client.NewClientEmpty()
 	c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !conf.Account.UseSSOAddress {
+		if !base.UseSSOAddress {
 			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
 			return false
 		}
@@ -629,7 +382,7 @@ func newClient() *client.QQClient {
 		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
 		addr := global.ReadAddrFile("address.txt")
 		if len(addr) > 0 {
-			cli.SetCustomServer(addr)
+			c.SetCustomServer(addr)
 		}
 		log.Infof("读取到 %v 个自定义地址.", len(addr))
 	}

modules/config/config.go

@@ -6,12 +6,10 @@ import (
 	_ "embed" // embed the default config file
 	"fmt"
 	"os"
-	"path"
 	"strconv"
 	"strings"
-	"sync"
 
-	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/param"
 
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
@@ -21,27 +19,27 @@ import (
 //go:embed default_config.yml
 var defaultConfig string
 
-var currentPath = getCurrentPath()
+// Reconnect 重连配置
+type Reconnect struct {
+	Disabled bool `yaml:"disabled"`
+	Delay    uint `yaml:"delay"`
+	MaxTimes uint `yaml:"max-times"`
+	Interval int  `yaml:"interval"`
+}
 
-// DefaultConfigFile 默认配置文件路径
-var DefaultConfigFile = path.Join(currentPath, "config.yml")
+// Account 账号配置
+type Account struct {
+	Uin           int64      `yaml:"uin"`
+	Password      string     `yaml:"password"`
+	Encrypt       bool       `yaml:"encrypt"`
+	Status        int        `yaml:"status"`
+	ReLogin       *Reconnect `yaml:"relogin"`
+	UseSSOAddress bool       `yaml:"use-sso-address"`
+}
 
 // Config 总配置文件
 type Config struct {
-	Account struct {
-		Uin      int64  `yaml:"uin"`
-		Password string `yaml:"password"`
-		Encrypt  bool   `yaml:"encrypt"`
-		Status   int32  `yaml:"status"`
-		ReLogin  struct {
-			Disabled bool `yaml:"disabled"`
-			Delay    uint `yaml:"delay"`
-			MaxTimes uint `yaml:"max-times"`
-			Interval int  `yaml:"interval"`
-		}
-		UseSSOAddress bool `yaml:"use-sso-address"`
-	} `yaml:"account"`
-
+	Account   *Account `yaml:"account"`
 	Heartbeat struct {
 		Disabled bool `yaml:"disabled"`
 		Interval int  `yaml:"interval"`
@@ -49,10 +47,10 @@ type Config struct {
 
 	Message struct {
 		PostFormat          string `yaml:"post-format"`
+		ProxyRewrite        string `yaml:"proxy-rewrite"`
 		IgnoreInvalidCQCode bool   `yaml:"ignore-invalid-cqcode"`
 		ForceFragment       bool   `yaml:"force-fragment"`
 		FixURL              bool   `yaml:"fix-url"`
-		ProxyRewrite        string `yaml:"proxy-rewrite"`
 		ReportSelfMessage   bool   `yaml:"report-self-message"`
 		RemoveReplyAt       bool   `yaml:"remove-reply-at"`
 		ExtraReplyData      bool   `yaml:"extra-reply-data"`
@@ -139,28 +137,29 @@ type LevelDBConfig struct {
 	Enable bool `yaml:"enable"`
 }
 
-var (
-	config *Config
-	once   sync.Once
-)
+// MongoDBConfig mongodb 相关配置
+type MongoDBConfig struct {
+	Enable   bool   `yaml:"enable"`
+	URI      string `yaml:"uri"`
+	Database string `yaml:"database"`
+}
 
-// Get 从默认配置文件路径中获取
-func Get() *Config {
-	once.Do(func() {
-		hasEnvironmentConf := os.Getenv("GCQ_UIN") != ""
+// Parse 从默认配置文件路径中获取
+func Parse(path string) *Config {
+	fromEnv := os.Getenv("GCQ_UIN") != ""
 
-		file, err := os.Open(DefaultConfigFile)
-		config = &Config{}
-		if err == nil {
-			defer func() { _ = file.Close() }()
-			if err = yaml.NewDecoder(file).Decode(config); err != nil && !hasEnvironmentConf {
-				log.Fatal("配置文件不合法!", err)
-			}
-		} else if !hasEnvironmentConf {
-			generateConfig()
-			os.Exit(0)
+	file, err := os.Open(path)
+	config := &Config{}
+	if err == nil {
+		defer func() { _ = file.Close() }()
+		if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv {
+			log.Fatal("配置文件不合法!", err)
 		}
-
+	} else if !fromEnv {
+		generateConfig()
+		os.Exit(0)
+	}
+	if fromEnv {
 		// type convert tools
 		toInt64 := func(str string) int64 {
 			i, _ := strconv.ParseInt(str, 10, 64)
@@ -168,12 +167,21 @@ func Get() *Config {
 		}
 
 		// load config from environment variable
-		global.SetAtDefault(&config.Account.Uin, toInt64(os.Getenv("GCQ_UIN")), int64(0))
-		global.SetAtDefault(&config.Account.Password, os.Getenv("GCQ_PWD"), "")
-		global.SetAtDefault(&config.Account.Status, int32(toInt64(os.Getenv("GCQ_STATUS"))), int32(0))
-		global.SetAtDefault(&config.Account.ReLogin.Disabled, !global.EnsureBool(os.Getenv("GCQ_RELOGIN"), false), false)
-		global.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0))
-		global.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0))
+		param.SetAtDefault(&config.Account.Uin, toInt64(os.Getenv("GCQ_UIN")), int64(0))
+		param.SetAtDefault(&config.Account.Password, os.Getenv("GCQ_PWD"), "")
+		param.SetAtDefault(&config.Account.Status, int32(toInt64(os.Getenv("GCQ_STATUS"))), int32(0))
+		param.SetAtDefault(&config.Account.ReLogin.Disabled, !param.EnsureBool(os.Getenv("GCQ_RELOGIN_DISABLED"), true), false)
+		param.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0))
+		param.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0))
+		dbConf := &LevelDBConfig{Enable: param.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)}
+		if config.Database == nil {
+			config.Database = make(map[string]yaml.Node)
+		}
+		config.Database["leveldb"] = func() yaml.Node {
+			n := &yaml.Node{}
+			_ = n.Encode(dbConf)
+			return *n
+		}()
 		accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
 		if os.Getenv("GCQ_HTTP_PORT") != "" {
 			node := &yaml.Node{}
@@ -184,9 +192,9 @@ func Get() *Config {
 					AccessToken: accessTokenEnv,
 				},
 			}
-			global.SetExcludeDefault(&httpConf.Disabled, global.EnsureBool(os.Getenv("GCQ_HTTP_DISABLE"), false), false)
-			global.SetExcludeDefault(&httpConf.Host, os.Getenv("GCQ_HTTP_HOST"), "")
-			global.SetExcludeDefault(&httpConf.Port, int(toInt64(os.Getenv("GCQ_HTTP_PORT"))), 0)
+			param.SetExcludeDefault(&httpConf.Disabled, param.EnsureBool(os.Getenv("GCQ_HTTP_DISABLE"), false), false)
+			param.SetExcludeDefault(&httpConf.Host, os.Getenv("GCQ_HTTP_HOST"), "")
+			param.SetExcludeDefault(&httpConf.Port, int(toInt64(os.Getenv("GCQ_HTTP_PORT"))), 0)
 			if os.Getenv("GCQ_HTTP_POST_URL") != "" {
 				httpConf.Post = append(httpConf.Post, struct {
 					URL    string `yaml:"url"`
@@ -205,9 +213,9 @@ func Get() *Config {
 					AccessToken: accessTokenEnv,
 				},
 			}
-			global.SetExcludeDefault(&wsServerConf.Disabled, global.EnsureBool(os.Getenv("GCQ_WS_DISABLE"), false), false)
-			global.SetExcludeDefault(&wsServerConf.Host, os.Getenv("GCQ_WS_HOST"), "")
-			global.SetExcludeDefault(&wsServerConf.Port, int(toInt64(os.Getenv("GCQ_WS_PORT"))), 0)
+			param.SetExcludeDefault(&wsServerConf.Disabled, param.EnsureBool(os.Getenv("GCQ_WS_DISABLE"), false), false)
+			param.SetExcludeDefault(&wsServerConf.Host, os.Getenv("GCQ_WS_HOST"), "")
+			param.SetExcludeDefault(&wsServerConf.Port, int(toInt64(os.Getenv("GCQ_WS_PORT"))), 0)
 			_ = node.Encode(wsServerConf)
 			config.Servers = append(config.Servers, map[string]yaml.Node{"ws": *node})
 		}
@@ -218,24 +226,15 @@ func Get() *Config {
 					AccessToken: accessTokenEnv,
 				},
 			}
-			global.SetExcludeDefault(&rwsConf.Disabled, global.EnsureBool(os.Getenv("GCQ_RWS_DISABLE"), false), false)
-			global.SetExcludeDefault(&rwsConf.API, os.Getenv("GCQ_RWS_API"), "")
-			global.SetExcludeDefault(&rwsConf.Event, os.Getenv("GCQ_RWS_EVENT"), "")
-			global.SetExcludeDefault(&rwsConf.Universal, os.Getenv("GCQ_RWS_UNIVERSAL"), "")
+			param.SetExcludeDefault(&rwsConf.Disabled, param.EnsureBool(os.Getenv("GCQ_RWS_DISABLE"), false), false)
+			param.SetExcludeDefault(&rwsConf.API, os.Getenv("GCQ_RWS_API"), "")
+			param.SetExcludeDefault(&rwsConf.Event, os.Getenv("GCQ_RWS_EVENT"), "")
+			param.SetExcludeDefault(&rwsConf.Universal, os.Getenv("GCQ_RWS_UNIVERSAL"), "")
 			_ = node.Encode(rwsConf)
 			config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node})
 		}
-	})
-	return config
-}
-
-// getCurrentPath 获取当前文件的路径，直接返回string
-func getCurrentPath() string {
-	cwd, e := os.Getwd()
-	if e != nil {
-		panic(e)
 	}
-	return cwd
+	return config
 }
 
 // generateConfig 生成配置文件

modules/config/default_config.yml

@@ -75,6 +75,11 @@ database: # 数据库相关设置
     # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
     enable: true
 
+  # 媒体文件缓存， 删除此项则使用缓存文件(旧版行为)
+  cache:
+    image: data/image.db
+    video: data/video.db
+
 # 连接服务列表
 servers:
   # 添加方式，同一连接方式可添加多个，具体配置说明请查看文档

modules/mime/mime.go

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

modules/servers/servers.go

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

modules/silk/codec.go

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

modules/silk/codec_unsupported.go

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

modules/silk/stubs.go

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

server/api.go

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

server/doc.go

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

server/http.go

@@ -5,23 +5,26 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"io"
+	"math/rand"
 	"net/http"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/guonaihong/gout"
-	"github.com/guonaihong/gout/dataflow"
-	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+	"gopkg.in/yaml.v3"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
 type httpServer struct {
@@ -30,8 +33,6 @@ type httpServer struct {
 	accessToken string
 }
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 // HTTPClient 反向HTTP上报客户端
 type HTTPClient struct {
 	bot     *coolq.CQBot
@@ -53,13 +54,22 @@ func (h *httpCtx) Get(s string) gjson.Result {
 	if j.Exists() {
 		return j
 	}
+	validJSONParam := func(p string) bool {
+		return (strings.HasPrefix(p, "{") || strings.HasPrefix(p, "[")) && gjson.Valid(p)
+	}
 	if h.postForm != nil {
 		if form := h.postForm.Get(s); form != "" {
+			if validJSONParam(form) {
+				return gjson.Result{Type: gjson.JSON, Raw: form}
+			}
 			return gjson.Result{Type: gjson.String, Str: form}
 		}
 	}
 	if h.query != nil {
 		if query := h.query.Get(s); query != "" {
+			if validJSONParam(query) {
+				return gjson.Result{Type: gjson.JSON, Raw: query}
+			}
 			return gjson.Result{Type: gjson.String, Str: query}
 		}
 	}
@@ -107,14 +117,21 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
 		return
 	}
 
-	action := strings.TrimPrefix(request.URL.Path, "/")
-	action = strings.TrimSuffix(action, "_async")
-	log.Debugf("HTTPServer接收到API调用: %v", action)
-	ret := s.api.callAPI(action, &ctx)
+	var response global.MSG
+	if base.AcceptOneBotV12HTTPEndPoint && request.URL.Path == "/" {
+		action := strings.TrimSuffix(ctx.Get("action").Str, "_async")
+		log.Debugf("HTTPServer接收到API调用: %v", action)
+		response = s.api.callAPI(action, ctx.Get("params"))
+	} else {
+		action := strings.TrimPrefix(request.URL.Path, "/")
+		action = strings.TrimSuffix(action, "_async")
+		log.Debugf("HTTPServer接收到API调用: %v", action)
+		response = s.api.callAPI(action, &ctx)
+	}
 
 	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
 	writer.WriteHeader(http.StatusOK)
-	_ = json.NewEncoder(writer).Encode(ret)
+	_ = json.NewEncoder(writer).Encode(response)
 }
 
 func checkAuth(req *http.Request, token string) int {
@@ -142,16 +159,19 @@ func checkAuth(req *http.Request, token string) int {
 	}
 }
 
-// RunHTTPServerAndClients 启动HTTP服务器与HTTP上报客户端
-func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
-	if conf.Disabled {
+// runHTTP 启动HTTP服务器与HTTP上报客户端
+func runHTTP(bot *coolq.CQBot, node yaml.Node) {
+	var conf config.HTTPServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取http配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
 		return
 	}
-	var (
-		s    = new(httpServer)
-		addr string
-	)
-	s.accessToken = conf.AccessToken
+
+	var addr string
+	s := &httpServer{accessToken: conf.AccessToken}
 	if conf.Host == "" || conf.Port == 0 {
 		goto client
 	}
@@ -204,7 +224,6 @@ func (c HTTPClient) Run() {
 }
 
 func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
-	var res string
 	if c.filter != "" {
 		filter := findFilter(c.filter)
 		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
@@ -213,40 +232,51 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 		}
 	}
 
-	err := gout.POST(c.addr).SetJSON(e.JSONBytes()).BindBody(&res).SetHeader(func() gout.H {
-		h := gout.H{
-			"X-Self-ID":  c.bot.Client.Uin,
-			"User-Agent": "CQHttp/4.15.0",
+	client := http.Client{Timeout: time.Second * time.Duration(c.timeout)}
+	req, _ := http.NewRequest("POST", c.addr, nil)
+	req.Header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
+	req.Header.Set("User-Agent", "CQHttp/4.15.0")
+	if c.secret != "" {
+		mac := hmac.New(sha1.New, []byte(c.secret))
+		_, _ = mac.Write(e.JSONBytes())
+		req.Header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
+	}
+	if c.apiPort != 0 {
+		req.Header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
+	}
+
+	var res *http.Response
+	var err error
+	const maxAttemptTimes = 5
+
+	for i := 0; i <= maxAttemptTimes; i++ {
+		res, err = client.Do(req)
+		if err == nil {
+			//goland:noinspection GoDeferInLoop
+			defer res.Body.Close()
+			break
 		}
-		if c.secret != "" {
-			mac := hmac.New(sha1.New, []byte(c.secret))
-			_, err := mac.Write(e.JSONBytes())
-			if err != nil {
-				log.Error(err)
-				return nil
-			}
-			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
+		if i != maxAttemptTimes {
+			log.Warnf("上报 Event 数据到 %v 失败: %v 将进行第 %d 次重试", c.addr, err, i+1)
 		}
-		if c.apiPort != 0 {
-			h["X-API-Port"] = c.apiPort
-		}
-		return h
-	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
-		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
-		Func(func(con *dataflow.Context) error {
-			if con.Error != nil {
-				log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
-				return con.Error
-			}
-			return nil
-		}).Do()
+		const maxWait = int64(time.Second * 3)
+		const minWait = int64(time.Millisecond * 500)
+		wait := rand.Int63n(maxWait-minWait) + minWait
+		time.Sleep(time.Duration(wait))
+	}
+
 	if err != nil {
 		log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
 		return
 	}
 	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
-	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.Parse(res))
+
+	r, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	if gjson.ValidBytes(r) {
+		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.ParseBytes(r))
 	}
 }
 

server/middlewares.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"os"
 	"sync"
+	"time"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
@@ -21,7 +22,7 @@ var (
 
 func rateLimit(frequency float64, bucketSize int) handler {
 	limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
-	return func(_ string, _ resultGetter) coolq.MSG {
+	return func(_ string, _ resultGetter) global.MSG {
 		_ = limiter.Wait(context.Background())
 		return nil
 	}
@@ -69,23 +70,43 @@ func longPolling(bot *coolq.CQBot, maxSize int) handler {
 		}
 		cond.Signal()
 	})
-	return func(action string, p resultGetter) coolq.MSG {
+	return func(action string, p resultGetter) global.MSG {
 		if action != "get_updates" {
 			return nil
 		}
-		mutex.Lock()
-		defer mutex.Unlock()
-		if queue.Len() == 0 {
-			cond.Wait()
+		var (
+			once    sync.Once
+			ch      = make(chan []interface{}, 1)
+			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
+		)
+		defer close(ch)
+		go func() {
+			mutex.Lock()
+			defer mutex.Unlock()
+			if queue.Len() == 0 {
+				cond.Wait()
+			}
+			once.Do(func() {
+				limit := int(p.Get("limit").Int())
+				if limit <= 0 || queue.Len() < limit {
+					limit = queue.Len()
+				}
+				ret := make([]interface{}, limit)
+				for i := 0; i < limit; i++ {
+					ret[i] = queue.Remove(queue.Front())
+				}
+				ch <- ret
+			})
+		}()
+		if timeout != 0 {
+			select {
+			case <-time.After(timeout):
+				once.Do(func() {})
+				return coolq.OK([]interface{}{})
+			case ret := <-ch:
+				return coolq.OK(ret)
+			}
 		}
-		limit := int(p.Get("limit").Int())
-		if limit <= 0 || queue.Len() < limit {
-			limit = queue.Len()
-		}
-		ret := make([]interface{}, limit)
-		for i := 0; i < limit; i++ {
-			ret[i] = queue.Remove(queue.Front())
-		}
-		return coolq.OK(ret)
+		return coolq.OK(<-ch)
 	}
 }

server/pprof.go

@@ -8,15 +8,23 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
 
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
-// RunPprofServer 启动 pprof 性能分析服务器
-func RunPprofServer(conf *config.PprofServer) {
-	if conf.Disabled {
+// runPprof 启动 pprof 性能分析服务器
+func runPprof(_ *coolq.CQBot, node yaml.Node) {
+	var conf config.PprofServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取pprof配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
 		return
 	}
+
 	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
 	mux := http.NewServeMux()
 	mux.HandleFunc("/debug/pprof/", pprof.Index)

server/scf.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -11,10 +13,11 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/utils"
 	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
 type lambdaClient struct {
@@ -34,20 +37,22 @@ type lambdaResponse struct {
 
 type lambdaResponseWriter struct {
 	statusCode int
+	buf        bytes.Buffer
 	header     http.Header
 }
 
+func (l *lambdaResponseWriter) Write(p []byte) (n int, err error) {
+	return l.buf.Write(p)
+}
+
 func (l *lambdaResponseWriter) Header() http.Header {
 	return l.header
 }
 
-func (l *lambdaResponseWriter) Write(data []byte) (int, error) {
+func (l *lambdaResponseWriter) flush() error {
 	buffer := global.NewBuffer()
 	defer global.PutBuffer(buffer)
-	body := ""
-	if data != nil {
-		body = utils.B2S(data)
-	}
+	body := utils.B2S(l.buf.Bytes())
 	header := make(map[string]string)
 	for k, v := range l.header {
 		header[k] = v[0]
@@ -62,10 +67,9 @@ func (l *lambdaResponseWriter) Write(data []byte) (int, error) {
 	r, _ := http.NewRequest("POST", cli.responseURL, buffer)
 	do, err := cli.client.Do(r)
 	if err != nil {
-		return 0, err
+		return err
 	}
-	_ = do.Body.Close()
-	return len(data), nil
+	return do.Body.Close()
 }
 
 func (l *lambdaResponseWriter) WriteHeader(statusCode int) {
@@ -74,8 +78,17 @@ func (l *lambdaResponseWriter) WriteHeader(statusCode int) {
 
 var cli *lambdaClient
 
-// RunLambdaClient  type: [scf,aws]
-func RunLambdaClient(bot *coolq.CQBot, conf *config.LambdaServer) {
+// runLambda  type: [scf,aws]
+func runLambda(bot *coolq.CQBot, node yaml.Node) {
+	var conf config.LambdaServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取lambda配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
+		return
+	}
+
 	cli = &lambdaClient{
 		lambdaType: conf.Type,
 		client:     http.Client{Timeout: 0},
@@ -84,8 +97,7 @@ func RunLambdaClient(bot *coolq.CQBot, conf *config.LambdaServer) {
 	case "scf": // tencent serverless function
 		base := fmt.Sprintf("http://%s:%s/runtime/",
 			os.Getenv("SCF_RUNTIME_API"),
-			os.Getenv("SCF_RUNTIME_API_PORT"),
-		)
+			os.Getenv("SCF_RUNTIME_API_PORT"))
 		cli.nextURL = base + "invocation/next"
 		cli.responseURL = base + "invocation/response"
 		post, err := http.Post(base+"init/ready", "", nil)
@@ -114,19 +126,20 @@ func RunLambdaClient(bot *coolq.CQBot, conf *config.LambdaServer) {
 
 	for {
 		req := cli.next()
-		if req == nil {
-			writer := lambdaResponseWriter{statusCode: 200}
-			_, _ = writer.Write(nil)
-			continue
-		}
+		writer := lambdaResponseWriter{statusCode: 200, header: make(http.Header)}
 		func() {
 			defer func() {
 				if e := recover(); e != nil {
 					log.Warnf("Lambda 出现不可恢复错误: %v\n%s", e, debug.Stack())
 				}
 			}()
-			server.ServeHTTP(&lambdaResponseWriter{header: make(http.Header)}, req)
+			if req != nil {
+				server.ServeHTTP(&writer, req)
+			}
 		}()
+		if err := writer.flush(); err != nil {
+			log.Warnf("Lambda 发送响应失败: %v", err)
+		}
 	}
 }
 
@@ -154,8 +167,8 @@ func (c *lambdaClient) next() *http.Request {
 	if resp.StatusCode != http.StatusOK {
 		return nil
 	}
-	var req = new(http.Request)
-	var invoke = new(lambdaInvoke)
+	req := new(http.Request)
+	invoke := new(lambdaInvoke)
 	_ = json.NewDecoder(resp.Body).Decode(invoke)
 	if invoke.HTTPMethod == "" { // 不是 api 网关
 		return nil

server/websocket.go

@@ -10,9 +10,11 @@ import (
 	"sync"
 	"time"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gorilla/websocket"
@@ -54,14 +56,20 @@ var upgrader = websocket.Upgrader{
 	},
 }
 
-// RunWebSocketServer 运行一个正向WS server
-func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
-	if conf.Disabled {
+// runWSServer 运行一个正向WS server
+func runWSServer(b *coolq.CQBot, node yaml.Node) {
+	var conf config.WebsocketServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取正向Websocket配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
 		return
 	}
+
 	s := &webSocketServer{
 		bot:    b,
-		conf:   conf,
+		conf:   &conf,
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
@@ -80,14 +88,20 @@ func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
 	}()
 }
 
-// RunWebSocketClient 运行一个正向WS client
-func RunWebSocketClient(b *coolq.CQBot, conf *config.WebsocketReverse) {
-	if conf.Disabled {
+// runWSClient 运行一个反向向WS client
+func runWSClient(b *coolq.CQBot, node yaml.Node) {
+	var conf config.WebsocketReverse
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取反向Websocket配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
 		return
 	}
+
 	c := &websocketClient{
 		bot:    b,
-		conf:   conf,
+		conf:   &conf,
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
@@ -160,7 +174,12 @@ func (c *websocketClient) connectEvent() {
 	}
 
 	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
-	c.eventConn = &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+	if c.eventConn == nil {
+		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+		c.eventConn = wrappedConn
+	} else {
+		c.eventConn.Conn = conn
+	}
 }
 
 func (c *websocketClient) connectUniversal() {
@@ -189,12 +208,16 @@ func (c *websocketClient) connectUniversal() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-	if c.conf.RateLimit.Enabled {
-		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
+	if c.universalConn == nil {
+		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
+		if c.conf.RateLimit.Enabled {
+			wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
+		}
+		c.universalConn = wrappedConn
+	} else {
+		c.universalConn.Conn = conn
 	}
-	go c.listenAPI(wrappedConn, true)
-	c.universalConn = wrappedConn
+	go c.listenAPI(c.universalConn, true)
 }
 
 func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {