update MiraiGo.

fix #557

.github/workflows/ci.yml

@@ -16,12 +16,16 @@ jobs:
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
+        goarch: ["386", amd64, arm, arm64]
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: arm64
           - goos: darwin
             goarch: "386"
+          - goos: windows
+            goarch: arm64
       fail-fast: true
 
     steps:

.github/workflows/release.yml

@@ -10,12 +10,16 @@ jobs:
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
+        goarch: ["386", amd64, arm, arm64]
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: arm64
           - goos: darwin
             goarch: "386"
+          - goos: windows
+            goarch: arm64
             
     steps:
       - uses: actions/checkout@v2
@@ -30,4 +34,4 @@ jobs:
           goarch: ${{ matrix.goarch }}
           goversion: "https://golang.org/dl/go1.15.3.linux-amd64.tar.gz"
           ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
-          
+          

.gitignore

@@ -1,2 +1,7 @@
 vendor/
 .idea
+config.hjson
+device.json
+codec/
+data/
+logs/

coolq/api.go

@@ -303,7 +303,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 			var newElem []message.IMessageElement
 			for _, elem := range content {
 				if img, ok := elem.(*LocalImageElement); ok {
-					gm, err := bot.Client.UploadGroupImage(groupId, img.Stream)
+					gm, err := bot.UploadLocalImageAsGroup(groupId, img)
 					if err != nil {
 						log.Warnf("警告：群 %v 图片上传失败: %v", groupId, err)
 						continue
@@ -311,6 +311,15 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 					newElem = append(newElem, gm)
 					continue
 				}
+				if video, ok := elem.(*LocalVideoElement); ok {
+					gm, err := bot.UploadLocalVideo(groupId, video)
+					if err != nil {
+						log.Warnf("警告：群 %v 视频上传失败: %v", groupId, err)
+						continue
+					}
+					newElem = append(newElem, gm)
+					continue
+				}
 				newElem = append(newElem, elem)
 			}
 			nodes = append(nodes, &message.ForwardNode{
@@ -345,7 +354,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
-			elem := bot.ConvertObjectMessage(m, true)
+			elem := bot.ConvertObjectMessage(m, false)
 			mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
@@ -649,6 +658,7 @@ func (bot *CQBot) CQGetStrangerInfo(userId int64) MSG {
 	return OK(MSG{
 		"user_id":  info.Uin,
 		"nickname": info.Nickname,
+		"qid":      info.Qid,
 		"sex": func() string {
 			if info.Sex == 1 {
 				return "female"
@@ -837,7 +847,7 @@ func (bot *CQBot) CQCanSendRecord() MSG {
 }
 
 func (bot *CQBot) CQOcrImage(imageId string) MSG {
-	img, err := bot.makeImageElem(map[string]string{"file": imageId}, true)
+	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageId}, false, true)
 	if err != nil {
 		log.Warnf("load image error: %v", err)
 		return Failed(100, "LOAD_FILE_ERROR", err.Error())

coolq/bot.go

@@ -3,8 +3,11 @@ package coolq
 import (
 	"bytes"
 	"encoding/gob"
+	"encoding/hex"
 	"fmt"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"hash/crc32"
+	"io"
 	"os"
 	"path"
 	"runtime/debug"
@@ -125,6 +128,22 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 	return bot.Client.UploadGroupImageByFile(groupCode, img.File)
 }
 
+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.CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		_, _ = video.Seek(0, io.SeekStart)
+		_, _ = v.thumb.Seek(0, io.SeekStart)
+		return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+	}
+	return &v.ShortVideoElement, nil
+}
+
 func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement) (*message.FriendImageElement, error) {
 	if img.Stream != nil {
 		return bot.Client.UploadPrivateImage(userId, img.Stream)
@@ -134,6 +153,7 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement
 	if err != nil {
 		return nil, err
 	}
+	defer f.Close()
 	return bot.Client.UploadPrivateImage(userId, f)
 }
 
@@ -158,6 +178,15 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 			newElem = append(newElem, gv)
 			continue
 		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(groupId, i)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupId, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
 		if i, ok := elem.(*PokeElement); ok {
 			if group := bot.Client.FindGroup(groupId); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
@@ -272,12 +301,21 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		if i, ok := elem.(*message.VoiceElement); ok {
 			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
 			if err != nil {
-				log.Warnf("警告: 好友 %v 消息语音上传失败: %v", target, err)
+				log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
 				continue
 			}
 			newElem = append(newElem, fv)
 			continue
 		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(target, i)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
 		if i, ok := elem.(*QQMusicElement); ok {
 			var msgStyle uint32 = 4
 			if i.MusicUrl == "" {

coolq/cqcode.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
@@ -35,7 +36,8 @@ var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 var IgnoreInvalidCQCode = false
 var SplitUrl = false
 
-const maxImageSize = 1024 * 1024 * 30 // 30MB
+const maxImageSize = 1024 * 1024 * 30  // 30MB
+const maxVideoSize = 1024 * 1024 * 100 // 100MB
 
 type PokeElement struct {
 	Target int64
@@ -77,6 +79,12 @@ type LocalVoiceElement struct {
 	Stream io.ReadSeeker
 }
 
+type LocalVideoElement struct {
+	message.ShortVideoElement
+	File  string
+	thumb io.ReadSeeker
+}
+
 func (e *GiftElement) Type() message.ElementType {
 	return message.At
 }
@@ -426,7 +434,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
 		}
 		elem, err := bot.ToElement(t, params, group)
 		if err != nil {
-			org := "[" + string(cqCode) + "]"
+			org := "[CQ:" + string(cqCode) + "]"
 			if !IgnoreInvalidCQCode {
 				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
 				r = append(r, message.NewText(org))
@@ -547,7 +555,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		}
 		return message.NewText(d["text"]), nil
 	case "image":
-		img, err := bot.makeImageElem(d, group)
+		img, err := bot.makeImageOrVideoElem(d, false, group)
 		if err != nil {
 			return nil, err
 		}
@@ -605,7 +613,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 			}
 		}()
 		data, err := bot.Client.GetTts(d["text"])
-		ioutil.WriteFile("tts.silk", data, 777)
 		if err != nil {
 			return nil, err
 		}
@@ -620,7 +627,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 			return nil, err
 		}
 		if !global.IsAMRorSILK(data) {
-			data, err = global.Encoder(data)
+			data, err = global.EncoderSilk(data)
 			if err != nil {
 				return nil, err
 			}
@@ -770,11 +777,55 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		if maxHeight == 0 {
 			maxHeight = 1000
 		}
-		img, err := bot.makeImageElem(d, group)
+		img, err := bot.makeImageOrVideoElem(d, false, group)
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
 		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
+	case "video":
+		cache := d["cache"]
+		if cache == "" {
+			cache = "1"
+		}
+		file, err := bot.makeImageOrVideoElem(d, true, group)
+		if err != nil {
+			return nil, err
+		}
+		v := file.(*LocalVideoElement)
+		if v.File == "" {
+			return v, nil
+		}
+		var data []byte
+		if cover, ok := d["cover"]; ok {
+			data, _ = global.FindFile(cover, cache, global.IMAGE_PATH)
+		} else {
+			_ = global.ExtractCover(v.File, v.File+".jpg")
+			data, _ = ioutil.ReadFile(v.File + ".jpg")
+		}
+		v.thumb = bytes.NewReader(data)
+		video, _ := os.Open(v.File)
+		defer video.Close()
+		_, err = video.Seek(4, io.SeekStart)
+		if err != nil {
+			return nil, err
+		}
+		var header = make([]byte, 4)
+		_, err = video.Read(header)
+		if !bytes.Equal(header, []byte{0x66, 0x74, 0x79, 0x70}) { // check file header ftyp
+			_, _ = video.Seek(0, io.SeekStart)
+			hash, _ := utils.ComputeMd5AndLength(video)
+			cacheFile := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".mp4")
+			if global.PathExists(cacheFile) && cache == "1" {
+				goto ok
+			}
+			err = global.EncodeMP4(v.File, cacheFile)
+			if err != nil {
+				return nil, err
+			}
+		ok:
+			v.File = cacheFile
+		}
+		return v, nil
 	default:
 		return nil, errors.New("unsupported cq code: " + t)
 	}
@@ -816,7 +867,7 @@ func CQCodeUnescapeValue(content string) string {
 }
 
 // 图片 elem 生成器，单独拎出来，用于公用
-func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessageElement, error) {
+func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
 	f := d["file"]
 	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
 		cache := d["cache"]
@@ -826,25 +877,28 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		}
 		hash := md5.Sum([]byte(f))
 		cacheFile := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		var maxSize = func() int64 {
+			if video {
+				return maxVideoSize
+			}
+			return maxImageSize
+		}()
+		thread, _ := strconv.Atoi(c)
 		if global.PathExists(cacheFile) && cache == "1" {
-			return &LocalImageElement{File: cacheFile}, nil
+			goto hasCacheFile
 		}
 		if global.PathExists(cacheFile) {
 			_ = os.Remove(cacheFile)
 		}
-		thread, _ := strconv.Atoi(c)
-		if err := global.DownloadFileMultiThreading(f, cacheFile, maxImageSize, thread, nil); err != nil {
+		if err := global.DownloadFileMultiThreading(f, cacheFile, maxSize, thread, nil); err != nil {
 			return nil, err
 		}
+	hasCacheFile:
+		if video {
+			return &LocalVideoElement{File: cacheFile}, nil
+		}
 		return &LocalImageElement{File: cacheFile}, nil
 	}
-	if strings.HasPrefix(f, "base64") {
-		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
-		if err != nil {
-			return nil, err
-		}
-		return &LocalImageElement{Stream: bytes.NewReader(b)}, nil
-	}
 	if strings.HasPrefix(f, "file") {
 		fu, err := url.Parse(f)
 		if err != nil {
@@ -855,14 +909,50 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		}
 		info, err := os.Stat(fu.Path)
 		if err != nil {
+			if !os.IsExist(err) {
+				return nil, errors.New("file not found")
+			}
 			return nil, err
 		}
+		if video {
+			if info.Size() == 0 || info.Size() >= maxVideoSize {
+				return nil, errors.New("invalid video size")
+			}
+			return &LocalVideoElement{File: fu.Path}, nil
+		}
 		if info.Size() == 0 || info.Size() >= maxImageSize {
 			return nil, errors.New("invalid image size")
 		}
 		return &LocalImageElement{File: fu.Path}, nil
 	}
 	rawPath := path.Join(global.IMAGE_PATH, f)
+	if video {
+		rawPath = path.Join(global.VIDEO_PATH, f)
+		if !global.PathExists(rawPath) {
+			return nil, errors.New("invalid video")
+		}
+		if path.Ext(rawPath) == ".video" {
+			b, _ := ioutil.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
+		} else {
+			return &LocalVideoElement{File: rawPath}, nil
+		}
+	}
+	if strings.HasPrefix(f, "base64") {
+		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
+		if err != nil {
+			return nil, err
+		}
+		return &LocalImageElement{Stream: bytes.NewReader(b)}, nil
+	}
 	if !global.PathExists(rawPath) && global.PathExists(path.Join(global.IMAGE_PATH_OLD, f)) {
 		rawPath = path.Join(global.IMAGE_PATH_OLD, f)
 	}
@@ -870,7 +960,7 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		rawPath += ".cqimg"
 	}
 	if !global.PathExists(rawPath) && d["url"] != "" {
-		return bot.makeImageElem(map[string]string{"file": d["url"]}, group)
+		return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
 	}
 	if global.PathExists(rawPath) {
 		file, err := os.Open(rawPath)
@@ -887,9 +977,11 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		if len(b) < 20 {
 			return nil, errors.New("invalid local file")
 		}
-		var size int32
-		var hash []byte
-		var url string
+		var (
+			size int32
+			hash []byte
+			url  string
+		)
 		if path.Ext(rawPath) == ".cqimg" {
 			for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
 				kv := strings.SplitN(line, "=", 2)
@@ -910,27 +1002,23 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		}
 		if size == 0 {
 			if url != "" {
-				return bot.makeImageElem(map[string]string{"file": url}, group)
+				return bot.makeImageOrVideoElem(map[string]string{"file": url}, 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)
-			if err != nil {
-				if url != "" {
-					return bot.makeImageElem(map[string]string{"file": url}, group)
-				}
-				return nil, err
-			}
-			return rsp, nil
+			rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
+			goto ok
 		}
-		rsp, err := bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
+		rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
+	ok:
 		if err != nil {
 			if url != "" {
-				return bot.makeImageElem(map[string]string{"file": url}, group)
+				return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group)
 			}
 			return nil, err
 		}
@@ -945,7 +1033,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 	var suf message.IMessageElement
 	if i, ok := elem.(*LocalImageElement); ok {
 		if group == false {
-			gm, err := bot.Client.UploadPrivateImage(1, i.Stream)
+			gm, err := bot.UploadLocalImageAsPrivate(1, i)
 			if err != nil {
 				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
@@ -953,7 +1041,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 			suf = gm
 			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		} else {
-			gm, err := bot.Client.UploadGroupImage(1, i.Stream)
+			gm, err := bot.UploadLocalImageAsGroup(1, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
 				return nil, err

coolq/event.go

@@ -566,7 +566,9 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			if !global.PathExists(path.Join(global.VIDEO_PATH, filename)) {
 				_ = ioutil.WriteFile(path.Join(global.VIDEO_PATH, 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)
 				}), 0644)

docs/cqhttp.md

@@ -270,6 +270,20 @@ Type: `node`
     }
 ]
 ````
+### 短视频消息
+
+Type: `video`
+
+范围: **发送/接收**
+
+参数:
+
+| 参数名  | 类型   | 说明                                              |
+| ------- | ------ | ------------------------------------------------|
+| `file`  | string | 支持http和file发送                                |
+| `cover` | string | 视频封面，支持http，file和base64发送，格式必须为jpg    |
+| `c`     | `2` `3`| 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
+示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
 
 ### XML 消息
 

global/codec.go

@@ -4,31 +4,26 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
-	"io/ioutil"
-	"path"
-	"sync"
-
+	"github.com/Mrs4s/go-cqhttp/global/codec"
 	log "github.com/sirupsen/logrus"
-	"github.com/wdvxdr1123/go-silk/silk"
+	"io/ioutil"
+	"os/exec"
+	"path"
 )
 
-var codec silk.Encoder
-var useCodec = true
-var once sync.Once
+var useSilkCodec = true
 
 func InitCodec() {
-	once.Do(func() {
-		log.Info("正在加载silk编码器...")
-		err := codec.Init("data/cache", "codec")
-		if err != nil {
-			log.Error(err)
-			useCodec = false
-		}
-	})
+	log.Info("正在加载silk编码器...")
+	err := codec.Init()
+	if err != nil {
+		log.Error(err)
+		useSilkCodec = false
+	}
 }
 
-func Encoder(data []byte) ([]byte, error) {
-	if useCodec == false {
+func EncoderSilk(data []byte) ([]byte, error) {
+	if useSilkCodec == false {
 		return nil, errors.New("no silk encoder")
 	}
 	h := md5.New()
@@ -43,3 +38,13 @@ func Encoder(data []byte) ([]byte, error) {
 	}
 	return slk, nil
 }
+
+func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
+	return cmd.Run()
+}
+
+func ExtractCover(src string, dst string) error {
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", dst)
+	return cmd.Run()
+}

global/codec/codec.go

@@ -0,0 +1,95 @@
+// +build linux windows darwin
+// +build 386 amd64 arm arm64
+
+package codec
+
+import (
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"os/exec"
+	"path"
+	"runtime"
+)
+
+const (
+	silkCachePath = "data/cache"
+	encoderPath   = "codec"
+)
+
+func downloadCodec(url string) (err error) {
+	resp, err := http.Get(url)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+	err = ioutil.WriteFile(getEncoderFilePath(), body, os.ModePerm)
+	return
+}
+
+func getEncoderFilePath() string {
+	encoderFile := path.Join(encoderPath, runtime.GOOS+"-"+runtime.GOARCH+"-encoder")
+	if runtime.GOOS == "windows" {
+		encoderFile = encoderFile + ".exe"
+	}
+	return encoderFile
+}
+
+func Init() error {
+	if !fileExist(silkCachePath) {
+		_ = os.MkdirAll(silkCachePath, os.ModePerm)
+	}
+	if !fileExist(encoderPath) {
+		_ = os.MkdirAll(encoderPath, os.ModePerm)
+	}
+	p := getEncoderFilePath()
+	if !fileExist(p) {
+		if err := downloadCodec("https://cdn.jsdelivr.net/gh/wdvxdr1123/tosilk/codec/" + runtime.GOOS + "-" + runtime.GOARCH + "-encoder"); err != nil {
+			return errors.New("下载依赖失败")
+		}
+	}
+	return nil
+}
+
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	// 1. 写入缓存文件
+	rawPath := path.Join(silkCachePath, tempName+".wav")
+	err := ioutil.WriteFile(rawPath, record, os.ModePerm)
+	if err != nil {
+		return nil, err
+	}
+	defer os.Remove(rawPath)
+
+	// 2.转换pcm
+	pcmPath := path.Join(silkCachePath, tempName+".pcm")
+	cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
+	if err = cmd.Run(); err != nil {
+		return nil, err
+	}
+	defer os.Remove(pcmPath)
+
+	// 3. 转silk
+	silkPath := path.Join(silkCachePath, tempName+".silk")
+	cmd = exec.Command(getEncoderFilePath(), pcmPath, silkPath, "-rate", "24000", "-quiet", "-tencent")
+	if err = cmd.Run(); err != nil {
+		return nil, err
+	}
+	if useCache == false {
+		defer os.Remove(silkPath)
+	}
+	return ioutil.ReadFile(silkPath)
+}
+
+// FileExist 检查文件是否存在
+func fileExist(path string) bool {
+	if runtime.GOOS == "windows" {
+		path = path + ".exe"
+	}
+	_, err := os.Lstat(path)
+	return !os.IsNotExist(err)
+}

global/codec/codec_unsupportedarch.go

@@ -0,0 +1,13 @@
+// +build !386,!arm64,!amd64,!arm
+
+package codec
+
+import "errors"
+
+func Init() error {
+	return errors.New("Unsupport arch now")
+}
+
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("Unsupport arch now")
+}

global/codec/codec_unsupportedos.go

@@ -0,0 +1,13 @@
+// +build !windows,!linux,!darwin
+
+package codec
+
+import "errors"
+
+func Init() error {
+	return errors.New("not support now")
+}
+
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not support now")
+}

global/fs.go

@@ -216,7 +216,7 @@ func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
 		return
 	}
 
-	// move the new exectuable in to become the new program
+	// move the new executable in to become the new program
 	err = os.Rename(newPath, updatePath)
 
 	if err != nil {

global/net.go

@@ -23,7 +23,7 @@ import (
 
 var (
 	client = &http.Client{
-		Timeout: time.Second * 30,
+		Timeout: time.Second * 120,
 		Transport: &http.Transport{
 			Proxy: func(request *http.Request) (u *url.URL, e error) {
 				if Proxy == "" {
@@ -47,6 +47,8 @@ var (
 	Proxy string
 
 	ErrOverSize = errors.New("oversize")
+
+	UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
 )
 
 func GetBytes(url string) ([]byte, error) {
@@ -54,7 +56,7 @@ func GetBytes(url string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	req.Header["User-Agent"] = []string{"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36 Edg/83.0.478.61"}
+	req.Header["User-Agent"] = []string{UserAgent}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -74,7 +76,7 @@ func GetBytes(url string) ([]byte, error) {
 	return body, nil
 }
 
-func DownloadFile(url, path string, limit int64) error {
+func DownloadFile(url, path string, limit int64, headers map[string]string) error {
 	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
 		return err
@@ -84,6 +86,14 @@ func DownloadFile(url, path string, limit int64) error {
 	if err != nil {
 		return err
 	}
+	if headers != nil {
+		for k, v := range headers {
+			req.Header.Set(k, v)
+		}
+	}
+	if _, ok := headers["User-Agent"]; ok {
+		req.Header["User-Agent"] = []string{UserAgent}
+	}
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
@@ -101,7 +111,7 @@ func DownloadFile(url, path string, limit int64) error {
 
 func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
 	if threadCount < 2 {
-		return DownloadFile(url, path, limit)
+		return DownloadFile(url, path, limit, headers)
 	}
 	type BlockMetaData struct {
 		BeginOffset    int64
@@ -133,6 +143,9 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 				req.Header.Set(k, v)
 			}
 		}
+		if _, ok := headers["User-Agent"]; ok {
+			req.Header["User-Agent"] = []string{UserAgent}
+		}
 		req.Header.Set("range", "bytes=0-")
 		resp, err := client.Do(req)
 		if err != nil {
@@ -194,6 +207,9 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 				req.Header.Set(k, v)
 			}
 		}
+		if _, ok := headers["User-Agent"]; ok {
+			req.Header["User-Agent"] = []string{UserAgent}
+		}
 		req.Header.Set("range", "bytes="+strconv.FormatInt(block.BeginOffset, 10)+"-"+strconv.FormatInt(block.EndOffset, 10))
 		resp, err := client.Do(req)
 		if err != nil {

go.mod

@@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
 go 1.15
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20210105173234-72521dec9b56
+	github.com/Mrs4s/MiraiGo v0.0.0-20210115215446-8ee19f60514b
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
@@ -20,7 +20,6 @@ require (
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.6.7
-	github.com/wdvxdr1123/go-silk v0.0.0-20201210140933-bcdbcb2f1093
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324

go.sum

@@ -1,7 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20210105173234-72521dec9b56 h1:U7kObHDk3RfaD81+1hA29gxHf3PfRGpX7dqR2UPNO0c=
-github.com/Mrs4s/MiraiGo v0.0.0-20210105173234-72521dec9b56/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
+github.com/Mrs4s/MiraiGo v0.0.0-20210110160231-b83dd4cf38a5 h1:ee6LafOcoVM0nox2UxiIJgomgRP4pDJe5aeT/rq2o/U=
+github.com/Mrs4s/MiraiGo v0.0.0-20210110160231-b83dd4cf38a5/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
+github.com/Mrs4s/MiraiGo v0.0.0-20210115215446-8ee19f60514b h1:am1XzFc9Q5wSLLkrhjyDf5/IWq3qgNwJl2zzIRp2haw=
+github.com/Mrs4s/MiraiGo v0.0.0-20210115215446-8ee19f60514b/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -110,8 +112,6 @@ 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-20201210140933-bcdbcb2f1093 h1:t38EBwI2hFJz1sQJ402VqzdA3eMidkY1c3w/8z0SftA=
-github.com/wdvxdr1123/go-silk v0.0.0-20201210140933-bcdbcb2f1093/go.mod h1:5q9LFlBr+yX/J8Jd/9wHdXwkkjFkNyQIS7kX2Lgx/Zs=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=