`))+35:]
- b = b[bytes.Index(b, []byte(`
`))+3:]
- t = b[:bytes.Index(b, []byte(`倍`))]
- ret.LevelSpeed, _ = strconv.ParseFloat(string(t), 64)
- b = b[bytes.Index(b, []byte(``))+35:]
- b = b[bytes.Index(b, []byte(`
`))+3:]
- st := string(b[:bytes.Index(b, []byte(`
`))])
- st = strings.Replace(st, "
", "", 1)
- st = strings.Replace(st, "", "", 1)
- ret.VipLevel = st
- b = b[bytes.Index(b, []byte(`
`))+35:]
- b = b[bytes.Index(b, []byte(`
`))+3:]
- t = b[:bytes.Index(b, []byte(`
`))]
- ret.VipGrowthSpeed, _ = strconv.Atoi(string(t))
- b = b[bytes.Index(b, []byte(`
`))+35:]
- b = b[bytes.Index(b, []byte(`
`))+3:]
- t = b[:bytes.Index(b, []byte(`
`))]
- ret.VipGrowthTotal, _ = strconv.Atoi(string(t))
- return &ret, nil
-}
-
/* -------- GroupHonorInfo -------- */
type (
@@ -165,6 +118,32 @@ func (c *QQClient) GetTts(text string) ([]byte, error) {
/* -------- GroupNotice -------- */
+type groupNoticeRsp struct {
+ Feeds []*struct {
+ SenderId uint32 `json:"u"`
+ PublishTime uint64 `json:"pubt"`
+ Message struct {
+ Text string `json:"text"`
+ Images []noticeImage `json:"pics"`
+ } `json:"msg"`
+ } `json:"feeds"`
+}
+
+type GroupNoticeMessage struct {
+ SenderId uint32 `json:"sender_id"`
+ PublishTime uint64 `json:"publish_time"`
+ Message struct {
+ Text string `json:"text"`
+ Images []GroupNoticeImage `json:"images"`
+ } `json:"message"`
+}
+
+type GroupNoticeImage struct {
+ Height string `json:"height"`
+ Width string `json:"width"`
+ ID string `json:"id"`
+}
+
type noticePicUpResponse struct {
ErrorCode int `json:"ec"`
ErrorMessage string `json:"em"`
@@ -177,36 +156,77 @@ type noticeImage struct {
ID string `json:"id"`
}
+func (c *QQClient) GetGroupNotice(groupCode int64) (l []*GroupNoticeMessage, err error) {
+ v := url.Values{}
+ v.Set("bkn", strconv.Itoa(c.getCSRFToken()))
+ v.Set("qid", strconv.FormatInt(groupCode, 10))
+ v.Set("ft", "23")
+ v.Set("ni", "1")
+ v.Set("n", "1")
+ v.Set("i", "1")
+ v.Set("log_read", "1")
+ v.Set("platform", "1")
+ v.Set("s", "-1")
+ v.Set("n", "20")
+
+ req, _ := http.NewRequest(http.MethodGet, "https://web.qun.qq.com/cgi-bin/announce/get_t_list?"+v.Encode(), nil)
+ req.Header.Set("Cookie", c.getCookies())
+ rsp, err := utils.Client.Do(req)
+ if err != nil {
+ return
+ }
+ defer rsp.Body.Close()
+
+ r := groupNoticeRsp{}
+ err = json.NewDecoder(rsp.Body).Decode(&r)
+ if err != nil {
+ return
+ }
+
+ return c.parseGroupNoticeJson(&r), nil
+}
+
+func (c *QQClient) parseGroupNoticeJson(s *groupNoticeRsp) []*GroupNoticeMessage {
+ o := make([]*GroupNoticeMessage, 0, len(s.Feeds))
+ for _, v := range s.Feeds {
+
+ ims := make([]GroupNoticeImage, 0, len(v.Message.Images))
+ for i := 0; i < len(v.Message.Images); i++ {
+ ims = append(ims, GroupNoticeImage{
+ Height: v.Message.Images[i].Height,
+ Width: v.Message.Images[i].Width,
+ ID: v.Message.Images[i].ID,
+ })
+ }
+
+ o = append(o, &GroupNoticeMessage{
+ SenderId: v.SenderId,
+ PublishTime: v.PublishTime,
+ Message: struct {
+ Text string `json:"text"`
+ Images []GroupNoticeImage `json:"images"`
+ }{
+ Text: v.Message.Text,
+ Images: ims,
+ },
+ })
+ }
+
+ return o
+}
+
func (c *QQClient) uploadGroupNoticePic(img []byte) (*noticeImage, error) {
buf := new(bytes.Buffer)
w := multipart.NewWriter(buf)
- err := w.WriteField("bkn", strconv.Itoa(c.getCSRFToken()))
- if err != nil {
- return nil, errors.Wrap(err, "write multipart
failed")
- }
- err = w.WriteField("source", "troopNotice")
- if err != nil {
- return nil, errors.Wrap(err, "write multipart failed")
- }
- err = w.WriteField("m", "0")
- if err != nil {
- return nil, errors.Wrap(err, "write multipart failed")
- }
+ _ = w.WriteField("bkn", strconv.Itoa(c.getCSRFToken()))
+ _ = w.WriteField("source", "troopNotice")
+ _ = w.WriteField("m", "0")
h := make(textproto.MIMEHeader)
h.Set("Content-Disposition", `form-data; name="pic_up"; filename="temp_uploadFile.png"`)
h.Set("Content-Type", "image/png")
- fw, err := w.CreatePart(h)
- if err != nil {
- return nil, errors.Wrap(err, "create multipart field failed")
- }
- _, err = fw.Write(img)
- if err != nil {
- return nil, errors.Wrap(err, "write multipart failed")
- }
- err = w.Close()
- if err != nil {
- return nil, errors.Wrap(err, "close multipart failed")
- }
+ fw, _ := w.CreatePart(h)
+ _, _ = fw.Write(img)
+ _ = w.Close()
req, err := http.NewRequest("POST", "https://web.qun.qq.com/cgi-bin/announce/upload_img", buf)
if err != nil {
return nil, errors.Wrap(err, "new request error")
@@ -218,12 +238,8 @@ func (c *QQClient) uploadGroupNoticePic(img []byte) (*noticeImage, error) {
return nil, errors.Wrap(err, "post error")
}
defer resp.Body.Close()
- body, err := io.ReadAll(resp.Body)
- if err != nil {
- return nil, errors.Wrap(err, "read body error")
- }
- res := noticePicUpResponse{}
- err = json.Unmarshal(body, &res)
+ var res noticePicUpResponse
+ err = json.NewDecoder(resp.Body).Decode(&res)
if err != nil {
return nil, errors.Wrap(err, "failed to unmarshal json")
}
diff --git a/client/image.go b/client/image.go
index 3806b493..0764f203 100644
--- a/client/image.go
+++ b/client/image.go
@@ -1,8 +1,7 @@
package client
import (
- "bytes"
- "encoding/hex"
+ "fmt"
"io"
"math/rand"
"strings"
@@ -91,8 +90,9 @@ func (c *QQClient) uploadGroupOrGuildImage(target message.Source, img io.ReadSee
}.Encode()
}
- var r interface{}
+ var r any
var err error
+ var input highway.Transaction
switch target.SourceType {
case message.SourceGroup:
r, err = c.sendAndWait(c.buildGroupImageStorePacket(target.PrimaryID, fh, int32(length)))
@@ -115,22 +115,18 @@ func (c *QQClient) uploadGroupOrGuildImage(target message.Source, img io.ReadSee
}
}
+ input = highway.Transaction{
+ CommandID: cmd,
+ Body: img,
+ Size: length,
+ Sum: fh,
+ Ticket: rsp.UploadKey,
+ Ext: ext,
+ }
if tc > 1 && length > 3*1024*1024 {
- _, err = c.highwaySession.UploadBDHMultiThread(highway.BdhMultiThreadInput{
- CommandID: cmd,
- Body: utils.ReaderAtFrom2ReadSeeker(img, nil),
- Size: length,
- Sum: fh,
- Ticket: rsp.UploadKey,
- Ext: ext,
- }, 4)
+ _, err = c.highwaySession.UploadBDHMultiThread(input, tc)
} else {
- _, err = c.highwaySession.UploadBDH(highway.BdhInput{
- CommandID: cmd,
- Body: img,
- Ticket: rsp.UploadKey,
- Ext: ext,
- })
+ _, err = c.highwaySession.UploadBDH(input)
}
if err != nil {
return nil, errors.Wrap(err, "upload failed")
@@ -145,7 +141,7 @@ ok:
width := int32(i.Width)
height := int32(i.Height)
if err != nil && target.SourceType != message.SourceGroup {
- c.Warning("waring: decode image error: %v. this image will be displayed by wrong size in pc guild client", err)
+ c.warning("waring: decode image error: %v. this image will be displayed by wrong size in pc guild client", err)
width = 200
height = 200
}
@@ -158,7 +154,7 @@ ok:
}
return &message.GuildImageElement{
FileId: rsp.FileId,
- FilePath: hex.EncodeToString(fh) + ".jpg",
+ FilePath: fmt.Sprintf("%x.jpg", fh),
Size: int32(length),
DownloadIndex: rsp.DownloadIndex,
Width: width,
@@ -207,18 +203,18 @@ func (c *QQClient) uploadPrivateImage(target int64, img io.ReadSeeker, count int
return e, nil
}
-func (c *QQClient) ImageOcr(img interface{}) (*OcrResponse, error) {
+func (c *QQClient) ImageOcr(img any) (*OcrResponse, error) {
url := ""
switch e := img.(type) {
case *message.GroupImageElement:
url = e.Url
if b, err := utils.HTTPGetReadCloser(e.Url, ""); err == nil {
- if url, err = c.uploadOcrImage(b); err != nil {
+ if url, err = c.uploadOcrImage(b, e.Size, e.Md5); err != nil {
url = e.Url
}
_ = b.Close()
}
- rsp, err := c.sendAndWait(c.buildImageOcrRequestPacket(url, strings.ToUpper(hex.EncodeToString(e.Md5)), e.Size, e.Width, e.Height))
+ rsp, err := c.sendAndWait(c.buildImageOcrRequestPacket(url, fmt.Sprintf("%X", e.Md5), e.Size, e.Width, e.Height))
if err != nil {
return nil, err
}
@@ -318,7 +314,7 @@ func (c *QQClient) buildGroupImageDownloadPacket(fileId, groupCode int64, fileMd
return c.uniPacket("ImgStore.GroupPicDown", payload)
}
-func (c *QQClient) uploadOcrImage(img io.Reader) (string, error) {
+func (c *QQClient) uploadOcrImage(img io.Reader, size int32, sum []byte) (string, error) {
r := make([]byte, 16)
rand.Read(r)
ext, _ := proto.Marshal(&highway2.CommFileExtReq{
@@ -326,13 +322,13 @@ func (c *QQClient) uploadOcrImage(img io.Reader) (string, error) {
Uuid: binary.GenUUID(r),
})
- buf, _ := io.ReadAll(img)
- rsp, err := c.highwaySession.UploadBDH(highway.BdhInput{
+ rsp, err := c.highwaySession.UploadBDH(highway.Transaction{
CommandID: 76,
- Body: bytes.NewReader(buf),
+ Body: img,
+ Size: int64(size),
+ Sum: sum,
Ticket: c.highwaySession.SigSession,
Ext: ext,
- Encrypt: false,
})
if err != nil {
return "", errors.Wrap(err, "upload ocr image error")
@@ -365,7 +361,7 @@ func (c *QQClient) buildImageOcrRequestPacket(url, md5 string, size, weight, hei
}
// ImgStore.GroupPicUp
-func decodeGroupImageStoreResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeGroupImageStoreResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
pkt := cmd0x388.D388RspBody{}
err := proto.Unmarshal(payload, &pkt)
if err != nil {
@@ -392,7 +388,7 @@ func decodeGroupImageStoreResponse(_ *QQClient, _ *network.IncomingPacketInfo, p
}, nil
}
-func decodeGroupImageDownloadResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeGroupImageDownloadResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
pkt := cmd0x388.D388RspBody{}
if err := proto.Unmarshal(payload, &pkt); err != nil {
return nil, errors.Wrap(err, "unmarshal protobuf message error")
@@ -403,18 +399,15 @@ func decodeGroupImageDownloadResponse(_ *QQClient, _ *network.IncomingPacketInfo
if len(pkt.GetimgUrlRsp[0].FailMsg) != 0 {
return nil, errors.New(utils.B2S(pkt.GetimgUrlRsp[0].FailMsg))
}
- return "https://" + utils.B2S(pkt.GetimgUrlRsp[0].DownDomain) + utils.B2S(pkt.GetimgUrlRsp[0].BigDownPara), nil
+ return fmt.Sprintf("https://%s%s", pkt.GetimgUrlRsp[0].DownDomain, pkt.GetimgUrlRsp[0].BigDownPara), nil
}
// OidbSvc.0xe07_0
-func decodeImageOcrResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
- pkg := oidb.OIDBSSOPkg{}
+func decodeImageOcrResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := oidb.DE07RspBody{}
- if err := proto.Unmarshal(payload, &pkg); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
- }
- if err := proto.Unmarshal(pkg.Bodybuffer, &rsp); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
+ err := unpackOIDBPackage(payload, &rsp)
+ if err != nil {
+ return nil, err
}
if rsp.Wording != "" {
if strings.Contains(rsp.Wording, "服务忙") {
diff --git a/client/internal/highway/bdh.go b/client/internal/highway/bdh.go
index 4d76a182..352cd49f 100644
--- a/client/internal/highway/bdh.go
+++ b/client/internal/highway/bdh.go
@@ -12,31 +12,21 @@ import (
"golang.org/x/sync/errgroup"
"github.com/Mrs4s/MiraiGo/binary"
- "github.com/Mrs4s/MiraiGo/client/internal/network"
"github.com/Mrs4s/MiraiGo/client/pb"
"github.com/Mrs4s/MiraiGo/internal/proto"
- "github.com/Mrs4s/MiraiGo/utils"
)
-type BdhInput struct {
+type Transaction struct {
CommandID int32
- Body io.ReadSeeker
+ Body io.Reader
+ Sum []byte // md5 sum of body
+ Size int64 // body size
Ticket []byte
Ext []byte
Encrypt bool
}
-type BdhMultiThreadInput struct {
- CommandID int32
- Body io.ReaderAt
- Sum []byte
- Size int64
- Ticket []byte
- Ext []byte
- Encrypt bool
-}
-
-func (bdh *BdhInput) encrypt(key []byte) error {
+func (bdh *Transaction) encrypt(key []byte) error {
if bdh.Encrypt {
if len(key) == 0 {
return errors.New("session key not found. maybe miss some packet?")
@@ -46,25 +36,13 @@ func (bdh *BdhInput) encrypt(key []byte) error {
return nil
}
-func (bdh *BdhMultiThreadInput) encrypt(key []byte) error {
- if bdh.Encrypt {
- if len(key) == 0 {
- return errors.New("session key not found. maybe miss some packet?")
- }
- bdh.Ext = binary.NewTeaCipher(key).Encrypt(bdh.Ext)
- }
- return nil
-}
-
-func (s *Session) UploadBDH(input BdhInput) ([]byte, error) {
+func (s *Session) UploadBDH(trans Transaction) ([]byte, error) {
if len(s.SsoAddr) == 0 {
return nil, errors.New("srv addrs not found. maybe miss some packet?")
}
addr := s.SsoAddr[0].String()
- sum, length := utils.ComputeMd5AndLength(input.Body)
- _, _ = input.Body.Seek(0, io.SeekStart)
- if err := input.encrypt(s.SessionKey); err != nil {
+ if err := trans.encrypt(s.SessionKey); err != nil {
return nil, err
}
conn, err := net.DialTimeout("tcp", addr, time.Second*20)
@@ -79,13 +57,17 @@ func (s *Session) UploadBDH(input BdhInput) ([]byte, error) {
}
const chunkSize = 256 * 1024
- var rspExt []byte
+ var rspExt, chunk []byte
offset := 0
- chunk := make([]byte, chunkSize)
+ if trans.Size > chunkSize {
+ chunk = make([]byte, chunkSize)
+ } else {
+ chunk = make([]byte, trans.Size)
+ }
for {
- chunk = chunk[:chunkSize]
- rl, err := io.ReadFull(input.Body, chunk)
- if errors.Is(err, io.EOF) {
+ chunk = chunk[:cap(chunk)]
+ rl, err := io.ReadFull(trans.Body, chunk)
+ if rl == 0 {
break
}
if errors.Is(err, io.ErrUnexpectedEOF) {
@@ -93,19 +75,20 @@ func (s *Session) UploadBDH(input BdhInput) ([]byte, error) {
}
ch := md5.Sum(chunk)
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
- MsgBasehead: s.dataHighwayHead(4096, input.CommandID, 2052),
+ MsgBasehead: s.dataHighwayHead(_REQ_CMD_DATA, 4096, trans.CommandID, 2052),
MsgSeghead: &pb.SegHead{
- Filesize: length,
+ Filesize: trans.Size,
Dataoffset: int64(offset),
Datalength: int32(rl),
- Serviceticket: input.Ticket,
+ Serviceticket: trans.Ticket,
Md5: ch[:],
- FileMd5: sum,
+ FileMd5: trans.Sum,
},
- ReqExtendinfo: input.Ext,
+ ReqExtendinfo: trans.Ext,
})
offset += rl
- _, err = io.Copy(conn, network.HeadBodyFrame(head, chunk))
+ frame := newFrame(head, chunk)
+ _, err = frame.WriteTo(conn)
if err != nil {
return nil, errors.Wrap(err, "write conn error")
}
@@ -120,23 +103,17 @@ func (s *Session) UploadBDH(input BdhInput) ([]byte, error) {
rspExt = rspHead.RspExtendinfo
}
if rspHead.MsgSeghead != nil && rspHead.MsgSeghead.Serviceticket != nil {
- input.Ticket = rspHead.MsgSeghead.Serviceticket
+ trans.Ticket = rspHead.MsgSeghead.Serviceticket
}
}
return rspExt, nil
}
-func (s *Session) UploadBDHMultiThread(input BdhMultiThreadInput, threadCount int) ([]byte, error) {
+func (s *Session) UploadBDHMultiThread(trans Transaction, threadCount int) ([]byte, error) {
// for small file and small thread count,
// use UploadBDH instead of UploadBDHMultiThread
- if input.Size < 1024*1024*3 || threadCount < 2 {
- return s.UploadBDH(BdhInput{
- CommandID: input.CommandID,
- Body: io.NewSectionReader(input.Body, 0, input.Size),
- Ticket: input.Ticket,
- Ext: input.Ext,
- Encrypt: input.Encrypt,
- })
+ if trans.Size < 1024*1024*3 || threadCount < 2 {
+ return s.UploadBDH(trans)
}
if len(s.SsoAddr) == 0 {
@@ -144,40 +121,25 @@ func (s *Session) UploadBDHMultiThread(input BdhMultiThreadInput, threadCount in
}
addr := s.SsoAddr[0].String()
- if err := input.encrypt(s.SessionKey); err != nil {
+ if err := trans.encrypt(s.SessionKey); err != nil {
return nil, err
}
- type BlockMetaData struct {
- Id int
- Offset int64
- }
- const blockSize int64 = 1024 * 512
+ const blockSize int64 = 256 * 1024
var (
- blocks []BlockMetaData
- rspExt []byte
- BlockId = ^uint32(0) // -1
- uploadedCount uint32
- cond = sync.NewCond(&sync.Mutex{})
+ rspExt []byte
+ completedThread uint32
+ cond = sync.NewCond(&sync.Mutex{})
+ offset = int64(0)
+ count = (trans.Size + blockSize - 1) / blockSize
+ id = 0
)
- // Init Blocks
- {
- var temp int64 = 0
- for temp+blockSize < input.Size {
- blocks = append(blocks, BlockMetaData{
- Id: len(blocks),
- Offset: temp,
- })
- temp += blockSize
- }
- blocks = append(blocks, BlockMetaData{
- Id: len(blocks),
- Offset: temp,
- })
- }
doUpload := func() error {
// send signal complete uploading
- defer cond.Signal()
+ defer func() {
+ atomic.AddUint32(&completedThread, 1)
+ cond.Signal()
+ }()
conn, err := net.DialTimeout("tcp", addr, time.Second*20)
if err != nil {
@@ -189,50 +151,45 @@ func (s *Session) UploadBDHMultiThread(input BdhMultiThreadInput, threadCount in
return err
}
- buffer := make([]byte, blockSize)
+ chunk := make([]byte, blockSize)
for {
- nextId := atomic.AddUint32(&BlockId, 1)
- if nextId >= uint32(len(blocks)) {
- break
- }
- block := blocks[nextId]
- if block.Id == len(blocks)-1 {
- cond.L.Lock()
- for atomic.LoadUint32(&uploadedCount) != uint32(len(blocks))-1 {
+ cond.L.Lock() // lock protect reading
+ off := offset
+ offset += blockSize
+ id++
+ if int64(id) == count { // last
+ for atomic.LoadUint32(&completedThread) != uint32(threadCount-1) {
cond.Wait()
}
+ } else if int64(id) > count {
cond.L.Unlock()
+ break
}
- buffer = buffer[:blockSize]
-
- cond.L.Lock() // lock protect reading
- n, err := input.Body.ReadAt(buffer, block.Offset)
+ chunk = chunk[:blockSize]
+ n, err := io.ReadFull(trans.Body, chunk)
cond.L.Unlock()
- if err != nil {
- if err == io.EOF {
- break
- }
- if err == io.ErrUnexpectedEOF {
- buffer = buffer[:n]
- } else {
- return err
- }
+ if n == 0 {
+ break
}
- ch := md5.Sum(buffer)
+ if errors.Is(err, io.ErrUnexpectedEOF) {
+ chunk = chunk[:n]
+ }
+ ch := md5.Sum(chunk)
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
- MsgBasehead: s.dataHighwayHead(4096, input.CommandID, 2052),
+ MsgBasehead: s.dataHighwayHead(_REQ_CMD_DATA, 4096, trans.CommandID, 2052),
MsgSeghead: &pb.SegHead{
- Filesize: input.Size,
- Dataoffset: block.Offset,
+ Filesize: trans.Size,
+ Dataoffset: off,
Datalength: int32(n),
- Serviceticket: input.Ticket,
+ Serviceticket: trans.Ticket,
Md5: ch[:],
- FileMd5: input.Sum,
+ FileMd5: trans.Sum,
},
- ReqExtendinfo: input.Ext,
+ ReqExtendinfo: trans.Ext,
})
- _, err = io.Copy(conn, network.HeadBodyFrame(head, buffer))
+ frame := newFrame(head, chunk)
+ _, err = frame.WriteTo(conn)
if err != nil {
return errors.Wrap(err, "write conn error")
}
@@ -246,7 +203,6 @@ func (s *Session) UploadBDHMultiThread(input BdhMultiThreadInput, threadCount in
if rspHead.RspExtendinfo != nil {
rspExt = rspHead.RspExtendinfo
}
- atomic.AddUint32(&uploadedCount, 1)
}
return nil
}
diff --git a/client/internal/highway/frame.go b/client/internal/highway/frame.go
new file mode 100644
index 00000000..ba1b6b38
--- /dev/null
+++ b/client/internal/highway/frame.go
@@ -0,0 +1,33 @@
+package highway
+
+import (
+ "encoding/binary"
+ "net"
+)
+
+var etx = []byte{0x29}
+
+// newFrame 包格式
+// * STX: 0x28(40)
+// * head length
+// * body length
+// * head data
+// * body data
+// * ETX: 0x29(41)
+// 节省内存, 可被go runtime优化为writev操作
+func newFrame(head []byte, body []byte) net.Buffers {
+ buffers := make(net.Buffers, 4)
+ // buffer0 format:
+ // * STX
+ // * head length
+ // * body length
+ buffer0 := make([]byte, 9)
+ buffer0[0] = 0x28
+ binary.BigEndian.PutUint32(buffer0[1:], uint32(len(head)))
+ binary.BigEndian.PutUint32(buffer0[5:], uint32(len(body)))
+ buffers[0] = buffer0
+ buffers[1] = head
+ buffers[2] = body
+ buffers[3] = etx
+ return buffers
+}
diff --git a/client/internal/highway/highway.go b/client/internal/highway/highway.go
index 81cd0ffd..05b53018 100644
--- a/client/internal/highway/highway.go
+++ b/client/internal/highway/highway.go
@@ -12,12 +12,17 @@ import (
"github.com/pkg/errors"
"github.com/Mrs4s/MiraiGo/binary"
- "github.com/Mrs4s/MiraiGo/client/internal/network"
"github.com/Mrs4s/MiraiGo/client/pb"
"github.com/Mrs4s/MiraiGo/internal/proto"
"github.com/Mrs4s/MiraiGo/utils"
)
+// see com/tencent/mobileqq/highway/utils/BaseConstants.java#L120-L121
+const (
+ _REQ_CMD_DATA = "PicUp.DataUp"
+ _REQ_CMD_HEART_BREAK = "PicUp.Echo"
+)
+
type Session struct {
Uin string
AppID int32
@@ -42,15 +47,7 @@ func (s *Session) AppendAddr(ip, port uint32) {
s.SsoAddr = append(s.SsoAddr, addr)
}
-type Input struct {
- CommandID int32
- Key []byte
- Body io.ReadSeeker
-}
-
-func (s *Session) Upload(addr Addr, input Input) error {
- fh, length := utils.ComputeMd5AndLength(input.Body)
- _, _ = input.Body.Seek(0, io.SeekStart)
+func (s *Session) Upload(addr Addr, trans Transaction) error {
conn, err := net.DialTimeout("tcp", addr.String(), time.Second*3)
if err != nil {
return errors.Wrap(err, "connect error")
@@ -61,11 +58,9 @@ func (s *Session) Upload(addr Addr, input Input) error {
chunk := make([]byte, chunkSize)
offset := 0
reader := binary.NewNetworkReader(conn)
- w := binary.SelectWriter()
- defer binary.PutWriter(w)
for {
chunk = chunk[:chunkSize]
- rl, err := io.ReadFull(input.Body, chunk)
+ rl, err := io.ReadFull(trans.Body, chunk)
if errors.Is(err, io.EOF) {
break
}
@@ -74,19 +69,20 @@ func (s *Session) Upload(addr Addr, input Input) error {
}
ch := md5.Sum(chunk)
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
- MsgBasehead: s.dataHighwayHead(4096, input.CommandID, 2052),
+ MsgBasehead: s.dataHighwayHead(_REQ_CMD_DATA, 4096, trans.CommandID, 2052),
MsgSeghead: &pb.SegHead{
- Filesize: length,
+ Filesize: trans.Size,
Dataoffset: int64(offset),
Datalength: int32(rl),
- Serviceticket: input.Key,
+ Serviceticket: trans.Ticket,
Md5: ch[:],
- FileMd5: fh,
+ FileMd5: trans.Sum,
},
ReqExtendinfo: []byte{},
})
offset += rl
- _, err = io.Copy(conn, network.HeadBodyFrame(head, chunk))
+ frame := newFrame(head, chunk)
+ _, err = frame.WriteTo(conn)
if err != nil {
return errors.Wrap(err, "write conn error")
}
@@ -133,7 +129,7 @@ func (s *Session) UploadExciting(input ExcitingInput) ([]byte, error) {
}
ch := md5.Sum(chunk)
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
- MsgBasehead: s.dataHighwayHead(0, input.CommandID, 0),
+ MsgBasehead: s.dataHighwayHead(_REQ_CMD_DATA, 0, input.CommandID, 0),
MsgSeghead: &pb.SegHead{
Filesize: fileLength,
Dataoffset: offset,
@@ -145,7 +141,8 @@ func (s *Session) UploadExciting(input ExcitingInput) ([]byte, error) {
ReqExtendinfo: input.Ext,
})
offset += int64(rl)
- req, _ := http.NewRequest("POST", url, network.HeadBodyFrame(head, chunk))
+ frame := newFrame(head, chunk)
+ req, _ := http.NewRequest("POST", url, &frame)
req.Header.Set("Accept", "*/*")
req.Header.Set("Connection", "Keep-Alive")
req.Header.Set("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)")
@@ -180,33 +177,25 @@ func (s *Session) nextSeq() int32 {
return atomic.AddInt32(&s.seq, 2)
}
-func (s *Session) dataHighwayHead(flag, cmd, locale int32) *pb.DataHighwayHead {
+func (s *Session) dataHighwayHead(cmd string, flag, cmdID, locale int32) *pb.DataHighwayHead {
return &pb.DataHighwayHead{
Version: 1,
Uin: s.Uin,
- Command: "PicUp.DataUp",
+ Command: cmd,
Seq: s.nextSeq(),
Appid: s.AppID,
Dataflag: flag,
- CommandId: cmd,
+ CommandId: cmdID,
LocaleId: locale,
}
}
func (s *Session) sendHeartbreak(conn net.Conn) error {
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
- MsgBasehead: &pb.DataHighwayHead{
- Version: 1,
- Uin: s.Uin,
- Command: "PicUp.Echo",
- Seq: s.nextSeq(),
- Appid: s.AppID,
- Dataflag: 4096,
- CommandId: 0,
- LocaleId: 2052,
- },
+ MsgBasehead: s.dataHighwayHead(_REQ_CMD_HEART_BREAK, 4096, 0, 2052),
})
- _, err := io.Copy(conn, network.HeadBodyFrame(head, nil))
+ frame := newFrame(head, nil)
+ _, err := frame.WriteTo(conn)
return err
}
diff --git a/client/internal/network/conn.go b/client/internal/network/conn.go
index a43614c1..682b3034 100644
--- a/client/internal/network/conn.go
+++ b/client/internal/network/conn.go
@@ -34,9 +34,9 @@ func (t *TCPListener) UnexpectedDisconnect(f func(*TCPListener, error)) {
t.unexpectedDisconnect = f
}
-func (t *TCPListener) Connect(addr *net.TCPAddr) error {
+func (t *TCPListener) Connect(addr string) error {
t.Close()
- conn, err := net.DialTCP("tcp", nil, addr)
+ conn, err := net.Dial("tcp", addr)
if err != nil {
return errors.Wrap(err, "dial tcp error")
}
diff --git a/client/internal/network/frame.go b/client/internal/network/frame.go
deleted file mode 100644
index c272a64a..00000000
--- a/client/internal/network/frame.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package network
-
-import (
- "encoding/binary"
- "io"
- "net"
- "sync"
-)
-
-var etx = []byte{0x29}
-
-type Buffers struct {
- net.Buffers
-}
-
-var pool = sync.Pool{
- New: func() interface{} {
- lenHead := make([]byte, 9)
- lenHead[0] = 0x28
- return &Buffers{net.Buffers{lenHead, nil, nil, etx}}
- },
-}
-
-func (b *Buffers) WriteTo(w io.Writer) (n int64, err error) {
- defer pool.Put(b) // implement auto put to pool
- return b.Buffers.WriteTo(w)
-}
-
-// HeadBodyFrame 包格式
-// * STX
-// * head length
-// * body length
-// * head data
-// * body data
-// * ETX
-// 节省内存, 可被go runtime优化为writev操作
-func HeadBodyFrame(head []byte, body []byte) *Buffers {
- b := pool.Get().(*Buffers)
- if len(b.Buffers) == 0 {
- lenHead := make([]byte, 9)
- lenHead[0] = 0x28
- b.Buffers = net.Buffers{lenHead, nil, nil, etx}
- }
- b.Buffers[2] = body
- b.Buffers[1] = head
- _ = b.Buffers[0][8]
- binary.BigEndian.PutUint32(b.Buffers[0][1:], uint32(len(head)))
- binary.BigEndian.PutUint32(b.Buffers[0][5:], uint32(len(body)))
- return b
-}
diff --git a/client/internal/network/packet.go b/client/internal/network/packet.go
index bccfe152..492791ef 100644
--- a/client/internal/network/packet.go
+++ b/client/internal/network/packet.go
@@ -6,7 +6,7 @@ type IncomingPacketInfo struct {
Params RequestParams
}
-type RequestParams map[string]interface{}
+type RequestParams map[string]any
func (p RequestParams) Bool(k string) bool {
if p == nil {
diff --git a/client/internal/network/request.go b/client/internal/network/request.go
index b34930f5..6e61686b 100644
--- a/client/internal/network/request.go
+++ b/client/internal/network/request.go
@@ -7,8 +7,6 @@ const (
RequestTypeSimple = 0x0B
)
-var emptyKey = make([]byte, 16)
-
type EncryptType uint32
const (
diff --git a/client/internal/network/response.go b/client/internal/network/response.go
index c2d97f3c..bdaa4c40 100644
--- a/client/internal/network/response.go
+++ b/client/internal/network/response.go
@@ -46,6 +46,7 @@ func (t *Transport) ReadResponse(head []byte) (*Response, error) {
case EncryptTypeD2Key:
body = binary.NewTeaCipher(t.Sig.D2Key).Decrypt(body)
case EncryptTypeEmptyKey:
+ emptyKey := make([]byte, 16)
body = binary.NewTeaCipher(emptyKey).Decrypt(body)
}
err := t.readSSOFrame(resp, body)
diff --git a/client/internal/network/transport.go b/client/internal/network/transport.go
index dd79a8d9..e2286e33 100644
--- a/client/internal/network/transport.go
+++ b/client/internal/network/transport.go
@@ -89,6 +89,7 @@ func (t *Transport) PackPacket(req *Request) []byte {
case EncryptTypeD2Key:
body = binary.NewTeaCipher(t.Sig.D2Key).Encrypt(body)
case EncryptTypeEmptyKey:
+ emptyKey := make([]byte, 16)
body = binary.NewTeaCipher(emptyKey).Encrypt(body)
}
w.Write(body)
diff --git a/client/internal/oicq/oicq.go b/client/internal/oicq/oicq.go
index c4469a40..9abe167f 100644
--- a/client/internal/oicq/oicq.go
+++ b/client/internal/oicq/oicq.go
@@ -84,7 +84,8 @@ func (c *Codec) Marshal(m *Message) []byte {
}
w.WriteByte(0x03)
- buf := append([]byte(nil), w.Bytes()...)
+ buf := make([]byte, len(w.Bytes()))
+ copy(buf, w.Bytes())
goBinary.BigEndian.PutUint16(buf[1:3], uint16(len(buf)))
return buf
}
diff --git a/client/log.go b/client/log.go
new file mode 100644
index 00000000..3aa6a1e4
--- /dev/null
+++ b/client/log.go
@@ -0,0 +1,43 @@
+package client
+
+type Logger interface {
+ Info(format string, args ...any)
+ Warning(format string, args ...any)
+ Error(format string, args ...any)
+ Debug(format string, args ...any)
+ Dump(dumped []byte, format string, args ...any)
+}
+
+func (c *QQClient) SetLogger(logger Logger) {
+ c.logger = logger
+}
+
+func (c *QQClient) info(msg string, args ...any) {
+ if c.logger != nil {
+ c.logger.Info(msg, args...)
+ }
+}
+
+func (c *QQClient) warning(msg string, args ...any) {
+ if c.logger != nil {
+ c.logger.Warning(msg, args...)
+ }
+}
+
+func (c *QQClient) error(msg string, args ...any) {
+ if c.logger != nil {
+ c.logger.Error(msg, args...)
+ }
+}
+
+func (c *QQClient) debug(msg string, args ...any) {
+ if c.logger != nil {
+ c.logger.Debug(msg, args...)
+ }
+}
+
+func (c *QQClient) dump(msg string, data []byte, args ...any) {
+ if c.logger != nil {
+ c.logger.Dump(data, msg, args...)
+ }
+}
diff --git a/client/model_show.go b/client/model_show.go
index 6b77a43b..c4160dd3 100644
--- a/client/model_show.go
+++ b/client/model_show.go
@@ -48,9 +48,8 @@ func (c *QQClient) getGtk(domain string) int {
accu = accu + (accu << 5) + int(b)
}
return 2147483647 & accu
- } else {
- return 0
}
+ return 0
}
func (c *QQClient) GetModelShow(modelName string) ([]*ModelVariant, error) {
diff --git a/client/multimsg.go b/client/multimsg.go
index 0348f903..8ca22486 100644
--- a/client/multimsg.go
+++ b/client/multimsg.go
@@ -2,14 +2,18 @@ package client
import (
"bytes"
+ "crypto/md5"
"fmt"
"math"
+ "math/rand"
+ "strconv"
"strings"
"time"
"github.com/pkg/errors"
"github.com/Mrs4s/MiraiGo/binary"
+ "github.com/Mrs4s/MiraiGo/client/internal/highway"
"github.com/Mrs4s/MiraiGo/client/internal/network"
"github.com/Mrs4s/MiraiGo/client/pb/longmsg"
"github.com/Mrs4s/MiraiGo/client/pb/msg"
@@ -47,7 +51,7 @@ func (c *QQClient) buildMultiApplyUpPacket(data, hash []byte, buType int32, grou
}
// MultiMsg.ApplyUp
-func decodeMultiApplyUpResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeMultiApplyUpResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
body := multimsg.MultiRspBody{}
if err := proto.Unmarshal(payload, &body); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
@@ -87,7 +91,7 @@ func (c *QQClient) buildMultiApplyDownPacket(resID string) (uint16, []byte) {
}
// MultiMsg.ApplyDown
-func decodeMultiApplyDownResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeMultiApplyDownResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
body := multimsg.MultiRspBody{}
if err := proto.Unmarshal(payload, &body); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
@@ -225,6 +229,88 @@ func forwardDisplay(resID, fileName, preview, summary string) string {
sb.WriteString(`
`)
sb.WriteString(summary)
// todo: 私聊的聊天记录？
- sb.WriteString(``)
+ sb.WriteString(``)
return sb.String()
}
+
+func (c *QQClient) NewForwardMessageBuilder(groupCode int64) *ForwardMessageBuilder {
+ return &ForwardMessageBuilder{
+ c: c,
+ groupCode: groupCode,
+ }
+}
+
+type ForwardMessageBuilder struct {
+ c *QQClient
+ groupCode int64
+ objs []*msg.PbMultiMsgItem
+}
+
+// NestedNode 返回一个嵌套转发节点，其内容将会被 Builder 重定位
+func (builder *ForwardMessageBuilder) NestedNode() *message.ForwardElement {
+ filename := strconv.FormatInt(time.Now().UnixNano(), 10) // 大概率不会重复
+ return &message.ForwardElement{FileName: filename}
+}
+
+// Link 将真实的消息内容填充 reloc
+func (builder *ForwardMessageBuilder) Link(reloc *message.ForwardElement, fmsg *message.ForwardMessage) {
+ seq := builder.c.nextGroupSeq()
+ m := fmsg.PackForwardMessage(seq, rand.Int31(), builder.groupCode)
+ builder.objs = append(builder.objs, &msg.PbMultiMsgItem{
+ FileName: proto.String(reloc.FileName),
+ Buffer: &msg.PbMultiMsgNew{
+ Msg: m,
+ },
+ })
+ reloc.Content = forwardDisplay("", reloc.FileName, fmsg.Preview(), fmt.Sprintf("查看 %d 条转发消息", fmsg.Length()))
+}
+
+// Main 最外层的转发消息, 调用该方法后即上传消息
+func (builder *ForwardMessageBuilder) Main(m *message.ForwardMessage) *message.ForwardElement {
+ if m.Length() > 200 {
+ return nil
+ }
+ c := builder.c
+ seq := c.nextGroupSeq()
+ fm := m.PackForwardMessage(seq, rand.Int31(), builder.groupCode)
+ const filename = "MultiMsg"
+ builder.objs = append(builder.objs, &msg.PbMultiMsgItem{
+ FileName: proto.String(filename),
+ Buffer: &msg.PbMultiMsgNew{
+ Msg: fm,
+ },
+ })
+ trans := &msg.PbMultiMsgTransmit{
+ Msg: fm,
+ PbItemList: builder.objs,
+ }
+ b, _ := proto.Marshal(trans)
+ data := binary.GZipCompress(b)
+ hash := md5.Sum(data)
+ rsp, body, err := c.multiMsgApplyUp(builder.groupCode, data, hash[:], 2)
+ if err != nil {
+ return nil
+ }
+ content := forwardDisplay(rsp.MsgResid, filename, m.Preview(), fmt.Sprintf("查看 %d 条转发消息", m.Length()))
+ for i, ip := range rsp.Uint32UpIp {
+ addr := highway.Addr{IP: uint32(ip), Port: int(rsp.Uint32UpPort[i])}
+ hash := md5.Sum(body)
+ input := highway.Transaction{
+ CommandID: 27,
+ Ticket: rsp.MsgSig,
+ Body: bytes.NewReader(body),
+ Sum: hash[:],
+ Size: int64(len(body)),
+ }
+ err := c.highwaySession.Upload(addr, input)
+ if err != nil {
+ continue
+ }
+ return &message.ForwardElement{
+ FileName: filename,
+ Content: content,
+ ResId: rsp.MsgResid,
+ }
+ }
+ return nil
+}
diff --git a/client/network.go b/client/network.go
index d5cbf229..868ebd03 100644
--- a/client/network.go
+++ b/client/network.go
@@ -40,34 +40,36 @@ func (c *QQClient) ConnectionQualityTest() *ConnectionQualityInfo {
r := &ConnectionQualityInfo{}
wg := sync.WaitGroup{}
wg.Add(2)
+
+ currentServerAddr := c.servers[c.currServerIndex].String()
go func() {
defer wg.Done()
var err error
- if r.ChatServerLatency, err = qualityTest(c.servers[c.currServerIndex].String()); err != nil {
- c.Error("test chat server latency error: %v", err)
+ if r.ChatServerLatency, err = qualityTest(currentServerAddr); err != nil {
+ c.error("test chat server latency error: %v", err)
r.ChatServerLatency = 9999
}
if addr, err := net.ResolveIPAddr("ip", "ssl.htdata.qq.com"); err == nil {
if r.LongMessageServerLatency, err = qualityTest((&net.TCPAddr{IP: addr.IP, Port: 443}).String()); err != nil {
- c.Error("test long message server latency error: %v", err)
+ c.error("test long message server latency error: %v", err)
r.LongMessageServerLatency = 9999
}
} else {
- c.Error("resolve long message server error: %v", err)
+ c.error("resolve long message server error: %v", err)
r.LongMessageServerLatency = 9999
}
if c.highwaySession.AddrLength() > 0 {
if r.SrvServerLatency, err = qualityTest(c.highwaySession.SsoAddr[0].String()); err != nil {
- c.Error("test srv server latency error: %v", err)
+ c.error("test srv server latency error: %v", err)
r.SrvServerLatency = 9999
}
}
}()
go func() {
defer wg.Done()
- res := utils.RunTCPPingLoop(c.servers[c.currServerIndex].String(), 10)
+ res := utils.RunTCPPingLoop(currentServerAddr, 10)
r.ChatServerPacketLoss = res.PacketsLoss
if c.highwaySession.AddrLength() > 0 {
res = utils.RunTCPPingLoop(c.highwaySession.SsoAddr[0].String(), 10)
@@ -78,7 +80,7 @@ func (c *QQClient) ConnectionQualityTest() *ConnectionQualityInfo {
if _, err := utils.HttpGetBytes("https://ssl.htdata.qq.com", ""); err == nil {
r.LongMessageServerResponseLatency = time.Since(start).Milliseconds()
} else {
- c.Error("test long message server response latency error: %v", err)
+ c.error("test long message server response latency error: %v", err)
r.LongMessageServerResponseLatency = 9999
}
wg.Wait()
@@ -87,8 +89,9 @@ func (c *QQClient) ConnectionQualityTest() *ConnectionQualityInfo {
// connect 连接到 QQClient.servers 中的服务器
func (c *QQClient) connect() error {
- c.Info("connect to server: %v", c.servers[c.currServerIndex].String())
- err := c.TCP.Connect(c.servers[c.currServerIndex])
+ addr := c.servers[c.currServerIndex].String()
+ c.info("connect to server: %v", addr)
+ err := c.TCP.Connect(addr)
c.currServerIndex++
if c.currServerIndex == len(c.servers) {
c.currServerIndex = 0
@@ -98,19 +101,19 @@ func (c *QQClient) connect() error {
if c.retryTimes > len(c.servers) {
return errors.New("All servers are unreachable")
}
- c.Error("connect server error: %v", err)
+ c.error("connect server error: %v", err)
return err
}
c.once.Do(func() {
- c.OnGroupMessage(func(_ *QQClient, _ *message.GroupMessage) {
+ c.GroupMessageEvent.Subscribe(func(_ *QQClient, _ *message.GroupMessage) {
c.stat.MessageReceived.Add(1)
c.stat.LastMessageTime.Store(time.Now().Unix())
})
- c.OnPrivateMessage(func(_ *QQClient, _ *message.PrivateMessage) {
+ c.PrivateMessageEvent.Subscribe(func(_ *QQClient, _ *message.PrivateMessage) {
c.stat.MessageReceived.Add(1)
c.stat.LastMessageTime.Store(time.Now().Unix())
})
- c.OnTempMessage(func(_ *QQClient, _ *TempMessageEvent) {
+ c.TempMessageEvent.Subscribe(func(_ *QQClient, _ *TempMessageEvent) {
c.stat.MessageReceived.Add(1)
c.stat.LastMessageTime.Store(time.Now().Unix())
})
@@ -129,14 +132,14 @@ func (c *QQClient) quickReconnect() {
c.Disconnect()
time.Sleep(time.Millisecond * 200)
if err := c.connect(); err != nil {
- c.Error("connect server error: %v", err)
- c.dispatchDisconnectEvent(&ClientDisconnectedEvent{Message: "quick reconnect failed"})
+ c.error("connect server error: %v", err)
+ c.DisconnectedEvent.dispatch(c, &ClientDisconnectedEvent{Message: "quick reconnect failed"})
return
}
if err := c.registerClient(); err != nil {
- c.Error("register client failed: %v", err)
+ c.error("register client failed: %v", err)
c.Disconnect()
- c.dispatchDisconnectEvent(&ClientDisconnectedEvent{Message: "register error"})
+ c.DisconnectedEvent.dispatch(c, &ClientDisconnectedEvent{Message: "register error"})
return
}
}
@@ -148,9 +151,9 @@ func (c *QQClient) Disconnect() {
}
// sendAndWait 向服务器发送一个数据包, 并等待返回
-func (c *QQClient) sendAndWait(seq uint16, pkt []byte, params ...network.RequestParams) (interface{}, error) {
+func (c *QQClient) sendAndWait(seq uint16, pkt []byte, params ...network.RequestParams) (any, error) {
type T struct {
- Response interface{}
+ Response any
Error error
}
ch := make(chan T, 1)
@@ -160,7 +163,7 @@ func (c *QQClient) sendAndWait(seq uint16, pkt []byte, params ...network.Request
p = params[0]
}
- c.handlers.Store(seq, &handlerInfo{fun: func(i interface{}, err error) {
+ c.handlers.Store(seq, &handlerInfo{fun: func(i any, err error) {
ch <- T{
Response: i,
Error: err,
@@ -204,7 +207,7 @@ func (c *QQClient) sendPacket(pkt []byte) error {
// waitPacket
// 等待一个或多个数据包解析, 优先级低于 sendAndWait
// 返回终止解析函数
-func (c *QQClient) waitPacket(cmd string, f func(interface{}, error)) func() {
+func (c *QQClient) waitPacket(cmd string, f func(any, error)) func() {
c.waiters.Store(cmd, f)
return func() {
c.waiters.Delete(cmd)
@@ -213,9 +216,9 @@ func (c *QQClient) waitPacket(cmd string, f func(interface{}, error)) func() {
// waitPacketTimeoutSyncF
// 等待一个数据包解析, 优先级低于 sendAndWait
-func (c *QQClient) waitPacketTimeoutSyncF(cmd string, timeout time.Duration, filter func(interface{}) bool) (r interface{}, e error) {
- notifyChan := make(chan bool)
- defer c.waitPacket(cmd, func(i interface{}, err error) {
+func (c *QQClient) waitPacketTimeoutSyncF(cmd string, timeout time.Duration, filter func(any) bool) (r any, e error) {
+ notifyChan := make(chan bool, 4)
+ defer c.waitPacket(cmd, func(i any, err error) {
if filter(i) {
r = i
e = err
@@ -234,7 +237,7 @@ func (c *QQClient) waitPacketTimeoutSyncF(cmd string, timeout time.Duration, fil
// 发送数据包并返回需要解析的 response
func (c *QQClient) sendAndWaitDynamic(seq uint16, pkt []byte) ([]byte, error) {
ch := make(chan []byte, 1)
- c.handlers.Store(seq, &handlerInfo{fun: func(i interface{}, err error) { ch <- i.([]byte) }, dynamic: true})
+ c.handlers.Store(seq, &handlerInfo{fun: func(i any, err error) { ch <- i.([]byte) }, dynamic: true})
err := c.sendPacket(pkt)
if err != nil {
c.handlers.Delete(seq)
@@ -251,25 +254,25 @@ func (c *QQClient) sendAndWaitDynamic(seq uint16, pkt []byte) ([]byte, error) {
// plannedDisconnect 计划中断线事件
func (c *QQClient) plannedDisconnect(_ *network.TCPListener) {
- c.Debug("planned disconnect.")
+ c.debug("planned disconnect.")
c.stat.DisconnectTimes.Add(1)
c.Online.Store(false)
}
// unexpectedDisconnect 非预期断线事件
func (c *QQClient) unexpectedDisconnect(_ *network.TCPListener, e error) {
- c.Error("unexpected disconnect: %v", e)
+ c.error("unexpected disconnect: %v", e)
c.stat.DisconnectTimes.Add(1)
c.Online.Store(false)
if err := c.connect(); err != nil {
- c.Error("connect server error: %v", err)
- c.dispatchDisconnectEvent(&ClientDisconnectedEvent{Message: "connection dropped by server."})
+ c.error("connect server error: %v", err)
+ c.DisconnectedEvent.dispatch(c, &ClientDisconnectedEvent{Message: "connection dropped by server."})
return
}
if err := c.registerClient(); err != nil {
- c.Error("register client failed: %v", err)
+ c.error("register client failed: %v", err)
c.Disconnect()
- c.dispatchDisconnectEvent(&ClientDisconnectedEvent{Message: "register error"})
+ c.DisconnectedEvent.dispatch(c, &ClientDisconnectedEvent{Message: "register error"})
return
}
}
@@ -284,7 +287,7 @@ func (c *QQClient) netLoop() {
continue
}
if l < 4 || l > 1024*1024*10 { // max 10MB
- c.Error("parse incoming packet error: invalid packet length %v", l)
+ c.error("parse incoming packet error: invalid packet length %v", l)
errCount++
if errCount > 2 {
go c.quickReconnect()
@@ -295,10 +298,10 @@ func (c *QQClient) netLoop() {
resp, err := c.transport.ReadResponse(data)
// pkt, err := packets.ParseIncomingPacket(data, c.sig.D2Key)
if err != nil {
- c.Error("parse incoming packet error: %v", err)
+ c.error("parse incoming packet error: %v", err)
if errors.Is(err, network.ErrSessionExpired) || errors.Is(err, network.ErrPacketDropped) {
c.Disconnect()
- go c.dispatchDisconnectEvent(&ClientDisconnectedEvent{Message: "session expired"})
+ go c.DisconnectedEvent.dispatch(c, &ClientDisconnectedEvent{Message: "session expired"})
continue
}
errCount++
@@ -310,7 +313,7 @@ func (c *QQClient) netLoop() {
if resp.EncryptType == network.EncryptTypeEmptyKey {
m, err := c.oicq.Unmarshal(resp.Body)
if err != nil {
- c.Error("decrypt payload error: %v", err)
+ c.error("decrypt payload error: %v", err)
if errors.Is(err, oicq.ErrUnknownFlag) {
go c.quickReconnect()
}
@@ -319,7 +322,7 @@ func (c *QQClient) netLoop() {
resp.Body = m.Body
}
errCount = 0
- c.Debug("rev pkt: %v seq: %v", resp.CommandName, resp.SequenceID)
+ c.debug("rev pkt: %v seq: %v", resp.CommandName, resp.SequenceID)
c.stat.PacketReceived.Add(1)
pkt := &packets.IncomingPacket{
SequenceId: uint16(resp.SequenceID),
@@ -329,15 +332,15 @@ func (c *QQClient) netLoop() {
go func(pkt *packets.IncomingPacket) {
defer func() {
if pan := recover(); pan != nil {
- c.Error("panic on decoder %v : %v\n%s", pkt.CommandName, pan, debug.Stack())
- c.Dump("packet decode error: %v - %v", pkt.Payload, pkt.CommandName, pan)
+ c.error("panic on decoder %v : %v\n%s", pkt.CommandName, pan, debug.Stack())
+ c.dump("packet decode error: %v - %v", pkt.Payload, pkt.CommandName, pan)
}
}()
if decoder, ok := decoders[pkt.CommandName]; ok {
// found predefined decoder
info, ok := c.handlers.LoadAndDelete(pkt.SequenceId)
- var decoded interface{}
+ var decoded any
decoded = pkt.Payload
if info == nil || !info.dynamic {
decoded, err = decoder(c, &network.IncomingPacketInfo{
@@ -346,19 +349,19 @@ func (c *QQClient) netLoop() {
Params: info.getParams(),
}, pkt.Payload)
if err != nil {
- c.Debug("decode pkt %v error: %+v", pkt.CommandName, err)
+ c.debug("decode pkt %v error: %+v", pkt.CommandName, err)
}
}
if ok {
info.fun(decoded, err)
} else if f, ok := c.waiters.Load(pkt.CommandName); ok { // 在不存在handler的情况下触发wait
- f.(func(interface{}, error))(decoded, err)
+ f(decoded, err)
}
} else if f, ok := c.handlers.LoadAndDelete(pkt.SequenceId); ok {
// does not need decoder
f.fun(pkt.Payload, nil)
} else {
- c.Debug("Unhandled Command: %s\nSeq: %d\nThis message can be ignored.", pkt.CommandName, pkt.SequenceId)
+ c.debug("Unhandled Command: %s\nSeq: %d\nThis message can be ignored.", pkt.CommandName, pkt.SequenceId)
}
}(pkt)
}
diff --git a/client/notify.go b/client/notify.go
index 634f88cb..df2e8aa0 100644
--- a/client/notify.go
+++ b/client/notify.go
@@ -62,7 +62,7 @@ func (c *QQClient) grayTipProcessor(groupCode int64, tipInfo *notify.GeneralGray
}
}
if sender != 0 {
- c.dispatchGroupNotifyEvent(&GroupPokeNotifyEvent{
+ c.GroupNotifyEvent.dispatch(c, &GroupPokeNotifyEvent{
GroupCode: groupCode,
Sender: sender,
Receiver: receiver,
@@ -81,7 +81,7 @@ func (c *QQClient) grayTipProcessor(groupCode int64, tipInfo *notify.GeneralGray
uin, _ = strconv.ParseInt(templ.Value, 10, 64)
}
}
- c.dispatchGroupNotifyEvent(&MemberHonorChangedNotifyEvent{
+ c.GroupNotifyEvent.dispatch(c, &MemberHonorChangedNotifyEvent{
GroupCode: groupCode,
Honor: func() HonorType {
switch tipInfo.TemplId {
@@ -139,13 +139,13 @@ func (c *QQClient) msgGrayTipProcessor(groupCode int64, tipInfo *notify.AIOGrayT
}
}
if event.Uin == 0 {
- c.Error("process special title updated tips error: missing cmd")
+ c.error("process special title updated tips error: missing cmd")
return
}
if mem := c.FindGroup(groupCode).FindMember(event.Uin); mem != nil {
mem.SpecialTitle = event.NewTitle
}
- c.dispatchMemberSpecialTitleUpdateEvent(event)
+ c.MemberSpecialTitleUpdatedEvent.dispatch(c, event)
}
}
diff --git a/client/offline_file.go b/client/offline_file.go
index 0fd8099e..a4b7e531 100644
--- a/client/offline_file.go
+++ b/client/offline_file.go
@@ -33,18 +33,18 @@ func (c *QQClient) buildOfflineFileDownloadRequestPacket(uuid []byte) (uint16, [
return seq, packet
}
-func decodeOfflineFileDownloadResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeOfflineFileDownloadResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := cmd0x346.C346RspBody{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
- c.Error("unmarshal cmd0x346 rsp body error: %v", err)
+ c.error("unmarshal cmd0x346 rsp body error: %v", err)
return nil, errors.Wrap(err, "unmarshal cmd0x346 rsp body error")
}
if rsp.ApplyDownloadRsp == nil {
- c.Error("decode apply download 1200 error: apply rsp is nil.")
+ c.error("decode apply download 1200 error: apply rsp is nil.")
return nil, errors.New("apply rsp is nil")
}
if rsp.ApplyDownloadRsp.RetCode != 0 {
- c.Error("decode apply download 1200 error: %v", rsp.ApplyDownloadRsp.RetCode)
+ c.error("decode apply download 1200 error: %v", rsp.ApplyDownloadRsp.RetCode)
return nil, errors.Errorf("apply download rsp error: %d", rsp.ApplyDownloadRsp.RetCode)
}
return "http://" + rsp.ApplyDownloadRsp.DownloadInfo.DownloadDomain + rsp.ApplyDownloadRsp.DownloadInfo.DownloadUrl, nil
diff --git a/client/online_push.go b/client/online_push.go
index 5a913b92..e237e0d1 100644
--- a/client/online_push.go
+++ b/client/online_push.go
@@ -23,7 +23,7 @@ var msg0x210Decoders = map[int64]func(*QQClient, []byte) error{
}
// OnlinePush.ReqPush
-func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (any, error) {
request := &jce.RequestPacket{}
request.ReadFrom(jce.NewJceReader(payload))
data := &jce.RequestDataVersion2{}
@@ -37,7 +37,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
if _, ok := c.onlinePushCache.Get(k); ok {
continue
}
- c.onlinePushCache.Add(k, "", time.Second*30)
+ c.onlinePushCache.Add(k, unit{}, time.Second*30)
// 0x2dc
if m.MsgType == 732 {
r := binary.NewReader(m.VMsg)
@@ -53,7 +53,17 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
r.ReadBytes(6)
target := int64(uint32(r.ReadInt32()))
t := r.ReadInt32()
- c.dispatchGroupMuteEvent(&GroupMuteEvent{
+
+ if target != 0 {
+ member := c.FindGroup(groupCode).FindMember(target)
+ if t > 0 {
+ member.ShutUpTimestamp = time.Now().Add(time.Second * time.Duration(t)).Unix()
+ } else {
+ member.ShutUpTimestamp = 0
+ }
+ }
+
+ c.GroupMuteEvent.dispatch(c, &GroupMuteEvent{
GroupCode: groupCode,
OperatorUin: operator,
TargetUin: target,
@@ -68,7 +78,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
if rm.MsgType == 2 {
continue
}
- c.dispatchGroupMessageRecalledEvent(&GroupMessageRecalledEvent{
+ c.GroupMessageRecalledEvent.dispatch(c, &GroupMessageRecalledEvent{
GroupCode: groupCode,
OperatorUin: b.OptMsgRecall.Uin,
AuthorUin: rm.AuthorUin,
@@ -82,7 +92,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
}
if b.OptMsgRedTips != nil {
if b.OptMsgRedTips.LuckyFlag == 1 { // 运气王提示
- c.dispatchGroupNotifyEvent(&GroupRedBagLuckyKingNotifyEvent{
+ c.GroupNotifyEvent.dispatch(c, &GroupRedBagLuckyKingNotifyEvent{
GroupCode: groupCode,
Sender: int64(b.OptMsgRedTips.SenderUin),
LuckyKing: int64(b.OptMsgRedTips.LuckyUin),
@@ -91,7 +101,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
}
if b.QqGroupDigestMsg != nil {
digest := b.QqGroupDigestMsg
- c.dispatchGroupDigestEvent(&GroupDigestEvent{
+ c.GroupDigestEvent.dispatch(c, &GroupDigestEvent{
GroupCode: int64(digest.GroupCode),
MessageID: int32(digest.Seq),
InternalMessageID: int32(digest.Random),
@@ -118,7 +128,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *network.IncomingPacketInfo, pa
return nil, errors.Wrap(err, "decode online push 0x210 error")
}
} else {
- c.Debug("unknown online push 0x210 sub type 0x%v", strconv.FormatInt(subType, 16))
+ c.debug("unknown online push 0x210 sub type 0x%v", strconv.FormatInt(subType, 16))
}
}
}
@@ -132,7 +142,7 @@ func msgType0x210Sub8ADecoder(c *QQClient, protobuf []byte) error {
}
for _, m := range s8a.MsgInfo {
if m.ToUin == c.Uin {
- c.dispatchFriendMessageRecalledEvent(&FriendMessageRecalledEvent{
+ c.FriendMessageRecalledEvent.dispatch(c, &FriendMessageRecalledEvent{
FriendUin: m.FromUin,
MessageId: m.MsgSeq,
Time: m.MsgTime,
@@ -152,7 +162,7 @@ func msgType0x210SubB3Decoder(c *QQClient, protobuf []byte) error {
Nickname: b3.MsgAddFrdNotify.Nick,
}
c.FriendList = append(c.FriendList, frd)
- c.dispatchNewFriendEvent(&NewFriendEvent{Friend: frd})
+ c.NewFriendEvent.dispatch(c, &NewFriendEvent{Friend: frd})
return nil
}
@@ -167,7 +177,7 @@ func msgType0x210SubD4Decoder(c *QQClient, protobuf []byte) error {
groupLeaveLock.Unlock()
return err
}
- c.dispatchLeaveGroupEvent(&GroupLeaveEvent{Group: g})
+ c.GroupLeaveEvent.dispatch(c, &GroupLeaveEvent{Group: g})
}
groupLeaveLock.Unlock()
return nil
@@ -185,7 +195,7 @@ func msgType0x210Sub27Decoder(c *QQClient, protobuf []byte) error {
if g := c.FindGroup(int64(m.ModGroupProfile.GetGroupCode())); g != nil {
old := g.Name
g.Name = string(info.Value)
- c.dispatchGroupNameUpdatedEvent(&GroupNameUpdatedEvent{
+ c.GroupNameUpdatedEvent.dispatch(c, &GroupNameUpdatedEvent{
Group: g,
OldName: old,
NewName: g.Name,
@@ -221,7 +231,7 @@ func msgType0x210Sub122Decoder(c *QQClient, protobuf []byte) error {
if sender == 0 {
return nil
}
- c.dispatchFriendNotifyEvent(&FriendPokeNotifyEvent{
+ c.FriendNotifyEvent.dispatch(c, &FriendPokeNotifyEvent{
Sender: sender,
Receiver: receiver,
})
@@ -241,7 +251,7 @@ func msgType0x210Sub44Decoder(c *QQClient, protobuf []byte) error {
if s44.GroupSyncMsg.GrpCode == 0 { // member sync
return errors.New("invalid group code")
}
- c.Debug("syncing members.")
+ c.debug("syncing members.")
if group := c.FindGroup(s44.GroupSyncMsg.GrpCode); group != nil {
group.lock.Lock()
defer group.lock.Unlock()
@@ -257,7 +267,7 @@ func msgType0x210Sub44Decoder(c *QQClient, protobuf []byte) error {
group.Members = newMem
for _, m := range newMem {
if lastJoinTime < m.JoinTime {
- go c.dispatchNewMemberEvent(&MemberJoinGroupEvent{
+ c.GroupMemberJoinEvent.dispatch(c, &MemberJoinGroupEvent{
Group: group,
Member: m,
})
diff --git a/client/private_msg.go b/client/private_msg.go
index e467c67d..fb89ec58 100644
--- a/client/private_msg.go
+++ b/client/private_msg.go
@@ -61,7 +61,7 @@ func (c *QQClient) SendPrivateMessage(target int64, m *message.SendingMessage) *
},
Elements: m.Elements,
}
- go c.dispatchPrivateMessageSelf(ret)
+ go c.SelfPrivateMessageEvent.dispatch(c, ret)
return ret
}
@@ -194,7 +194,6 @@ func (c *QQClient) buildGroupTempSendingPacket(groupUin, target int64, msgSeq, r
}
func (c *QQClient) buildWPATempSendingPacket(uin int64, sig []byte, msgSeq, r int32, time int64, m *message.SendingMessage) (uint16, []byte) {
-
req := &msg.SendMessageRequest{
RoutingHead: &msg.RoutingHead{WpaTmp: &msg.WPATmp{
ToUin: proto.Uint64(uint64(uin)),
diff --git a/client/ptt.go b/client/ptt.go
index 0d3e7fdf..4fb33873 100644
--- a/client/ptt.go
+++ b/client/ptt.go
@@ -1,7 +1,9 @@
package client
import (
+ "crypto/md5"
"encoding/hex"
+ "fmt"
"io"
"github.com/pkg/errors"
@@ -71,12 +73,13 @@ func (c *QQClient) UploadVoice(target message.Source, voice io.ReadSeeker) (*mes
ext = c.buildGroupPttStoreBDHExt(target.PrimaryID, fh, int32(length), 0, int32(length))
}
// multi-thread upload is no need
- rsp, err := c.highwaySession.UploadBDH(highway.BdhInput{
+ rsp, err := c.highwaySession.UploadBDH(highway.Transaction{
CommandID: cmd,
Body: voice,
+ Sum: fh,
+ Size: length,
Ticket: c.highwaySession.SigSession,
Ext: ext,
- Encrypt: false,
})
if err != nil {
return nil, err
@@ -88,7 +91,7 @@ func (c *QQClient) UploadVoice(target message.Source, voice io.ReadSeeker) (*mes
FileType: proto.Int32(4),
SrcUin: &c.Uin,
FileMd5: fh,
- FileName: proto.String(hex.EncodeToString(fh) + ".amr"),
+ FileName: proto.String(fmt.Sprintf("%x.amr", fh)),
FileSize: proto.Int32(int32(length)),
BoolValid: proto.Bool(true),
}
@@ -120,14 +123,17 @@ func (c *QQClient) UploadVoice(target message.Source, voice io.ReadSeeker) (*mes
// UploadShortVideo 将视频和封面上传到服务器, 返回 message.ShortVideoElement 可直接发送
// thread 上传线程数
func (c *QQClient) UploadShortVideo(target message.Source, video, thumb io.ReadSeeker, thread int) (*message.ShortVideoElement, error) {
- videoHash, videoLen := utils.ComputeMd5AndLength(video)
- thumbHash, thumbLen := utils.ComputeMd5AndLength(thumb)
+ thumbHash := md5.New()
+ thumbLen, _ := io.Copy(thumbHash, thumb)
+ thumbSum := thumbHash.Sum(nil)
+ videoSum, videoLen := utils.ComputeMd5AndLength(io.TeeReader(video, thumbHash))
+ sum := thumbHash.Sum(nil)
- key := string(videoHash) + string(thumbHash)
+ key := string(sum)
pttWaiter.Wait(key)
defer pttWaiter.Done(key)
- i, err := c.sendAndWait(c.buildPttGroupShortVideoUploadReqPacket(target, videoHash, thumbHash, videoLen, thumbLen))
+ i, err := c.sendAndWait(c.buildPttGroupShortVideoUploadReqPacket(target, videoSum, thumbSum, videoLen, thumbLen))
if err != nil {
return nil, errors.Wrap(err, "upload req error")
}
@@ -135,8 +141,8 @@ func (c *QQClient) UploadShortVideo(target message.Source, video, thumb io.ReadS
videoElement := &message.ShortVideoElement{
Size: int32(videoLen),
ThumbSize: int32(thumbLen),
- Md5: videoHash,
- ThumbMd5: thumbHash,
+ Md5: videoSum,
+ ThumbMd5: thumbSum,
Guild: target.SourceType == message.SourceGuildChannel,
}
if rsp.FileExists == 1 {
@@ -149,28 +155,22 @@ func (c *QQClient) UploadShortVideo(target message.Source, video, thumb io.ReadS
if target.SourceType == message.SourceGuildChannel {
cmd = 89
}
- ext, _ := proto.Marshal(c.buildPttShortVideoProto(target, videoHash, thumbHash, videoLen, thumbLen).PttShortVideoUploadReq)
+ ext, _ := proto.Marshal(c.buildPttShortVideoProto(target, videoSum, thumbSum, videoLen, thumbLen).PttShortVideoUploadReq)
+ _, _ = thumb.Seek(0, io.SeekStart)
+ _, _ = video.Seek(0, io.SeekStart)
+ combined := io.MultiReader(thumb, video)
+ input := highway.Transaction{
+ CommandID: cmd,
+ Body: combined,
+ Size: videoLen + thumbLen,
+ Sum: sum,
+ Ticket: c.highwaySession.SigSession,
+ Ext: ext,
+ Encrypt: true,
+ }
if thread > 1 {
- sum, _ := utils.ComputeMd5AndLength(utils.MultiReadSeeker(thumb, video))
- input := highway.BdhMultiThreadInput{
- CommandID: cmd,
- Body: utils.ReaderAtFrom2ReadSeeker(thumb, video),
- Size: videoLen + thumbLen,
- Sum: sum,
- Ticket: c.highwaySession.SigSession,
- Ext: ext,
- Encrypt: true,
- }
hwRsp, err = c.highwaySession.UploadBDHMultiThread(input, thread)
} else {
- multi := utils.MultiReadSeeker(thumb, video)
- input := highway.BdhInput{
- CommandID: cmd,
- Body: multi,
- Ticket: c.highwaySession.SigSession,
- Ext: ext,
- Encrypt: true,
- }
hwRsp, err = c.highwaySession.UploadBDH(input)
}
if err != nil {
@@ -262,7 +262,7 @@ func (c *QQClient) buildPttShortVideoProto(target message.Source, videoHash, thu
ChatType: chatType,
ClientType: 2,
Info: &pttcenter.ShortVideoFileInfo{
- FileName: hex.EncodeToString(videoHash) + ".mp4",
+ FileName: fmt.Sprintf("%x.mp4", videoHash),
FileMd5: videoHash,
ThumbFileMd5: thumbHash,
FileSize: videoSize,
@@ -326,7 +326,7 @@ func (c *QQClient) buildC2CPttStoreBDHExt(target int64, md5 []byte, size, voiceL
}
// PttCenterSvr.ShortVideoDownReq
-func decodePttShortVideoDownResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodePttShortVideoDownResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := pttcenter.ShortVideoRspBody{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
@@ -338,7 +338,7 @@ func decodePttShortVideoDownResponse(_ *QQClient, _ *network.IncomingPacketInfo,
}
// PttCenterSvr.GroupShortVideoUpReq
-func decodeGroupShortVideoUploadResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeGroupShortVideoUploadResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := pttcenter.ShortVideoRspBody{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
diff --git a/client/qidian.go b/client/qidian.go
index 1054ac5d..37f0b148 100644
--- a/client/qidian.go
+++ b/client/qidian.go
@@ -52,7 +52,7 @@ func (c *QQClient) getQiDianAddressDetailList() ([]*FriendInfo, error) {
ret := []*FriendInfo{}
for _, detail := range rsp.GetAddressDetailListRspBody.AddressDetail {
if len(detail.Qq) == 0 {
- c.Warning("address detail %v QQ is 0", string(detail.Name))
+ c.warning("address detail %v QQ is 0", string(detail.Name))
continue
}
ret = append(ret, &FriendInfo{
@@ -152,7 +152,7 @@ func (c *QQClient) bigDataRequest(subCmd uint32, req proto.Message) ([]byte, err
return tea.Decrypt(payload), nil
}
-func decodeLoginExtraResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeLoginExtraResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := cmd0x3f6.C3F6RspBody{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
@@ -168,7 +168,7 @@ func decodeLoginExtraResponse(c *QQClient, _ *network.IncomingPacketInfo, payloa
return nil, nil
}
-func decodeConnKeyResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeConnKeyResponse(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := cmd0x6ff.C501RspBody{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
diff --git a/client/recall.go b/client/recall.go
index a65104e9..a6f3546c 100644
--- a/client/recall.go
+++ b/client/recall.go
@@ -92,7 +92,7 @@ func (c *QQClient) buildPrivateRecallPacket(uin, ts int64, msgSeq, random int32)
return c.uniPacket("PbMessageSvc.PbMsgWithDraw", payload)
}
-func decodeMsgWithDrawResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeMsgWithDrawResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := msg.MsgWithDrawResp{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
diff --git a/client/richmsg.go b/client/richmsg.go
index efa3ba69..88356aaf 100644
--- a/client/richmsg.go
+++ b/client/richmsg.go
@@ -66,7 +66,7 @@ var musicType = [...]musicTypeInfo{
// SendGroupMusicShare 发送群聊音乐卡片
func (c *QQClient) SendGroupMusicShare(target int64, msg *message.MusicShareElement) (*message.GroupMessage, error) {
- ch := make(chan *message.GroupMessage)
+ ch := make(chan *message.GroupMessage, 2)
eid := utils.RandomString(6)
c.onGroupMessageReceipt(eid, func(c *QQClient, e *groupMessageReceiptEvent) {
for _, elem := range e.Msg.Elements {
diff --git a/client/security.go b/client/security.go
index 777a4031..e7bc3e5e 100644
--- a/client/security.go
+++ b/client/security.go
@@ -48,14 +48,11 @@ func (c *QQClient) buildUrlCheckRequest(url string) (uint16, []byte) {
return c.uniPacket("OidbSvc.0xbcb_0", payload)
}
-func decodeUrlCheckResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
- pkg := &oidb.OIDBSSOPkg{}
+func decodeUrlCheckResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := &oidb.DBCBRspBody{}
- if err := proto.Unmarshal(payload, pkg); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
- }
- if err := proto.Unmarshal(pkg.Bodybuffer, rsp); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
+ err := unpackOIDBPackage(payload, &rsp)
+ if err != nil {
+ return nil, err
}
if rsp.CheckUrlRsp == nil || len(rsp.CheckUrlRsp.Results) == 0 {
return nil, errors.New("response is empty")
diff --git a/client/sync.go b/client/sync.go
index cdb48647..2a75a986 100644
--- a/client/sync.go
+++ b/client/sync.go
@@ -77,9 +77,9 @@ func (c *QQClient) RefreshStatus() error {
// SyncSessions 同步会话列表
func (c *QQClient) SyncSessions() (*SessionSyncResponse, error) {
ret := &SessionSyncResponse{}
- notifyChan := make(chan bool)
+ notifyChan := make(chan bool, 4)
var groupNum int32 = -1
- stop := c.waitPacket("RegPrxySvc.PbSyncMsg", func(i interface{}, err error) {
+ stop := c.waitPacket("RegPrxySvc.PbSyncMsg", func(i any, err error) {
if err != nil {
return
}
@@ -90,7 +90,7 @@ func (c *QQClient) SyncSessions() (*SessionSyncResponse, error) {
if e.GroupNum != -1 {
groupNum = e.GroupNum
}
- c.Debug("sync session %v/%v", len(ret.GroupSessions), groupNum)
+ c.debug("sync session %v/%v", len(ret.GroupSessions), groupNum)
if groupNum != -1 && len(ret.GroupSessions) >= int(groupNum) {
notifyChan <- true
}
@@ -285,7 +285,7 @@ func (c *QQClient) buildPrivateMsgReadedPacket(uin, time int64) (uint16, []byte)
}
// StatSvc.GetDevLoginInfo
-func decodeDevListResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeDevListResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
request := &jce.RequestPacket{}
request.ReadFrom(jce.NewJceReader(payload))
data := &jce.RequestDataVersion2{}
@@ -307,7 +307,7 @@ func decodeDevListResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload [
}
// RegPrxySvc.PushParam
-func decodePushParamPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodePushParamPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
request := &jce.RequestPacket{}
request.ReadFrom(jce.NewJceReader(payload))
data := &jce.RequestDataVersion2{}
@@ -352,7 +352,7 @@ func decodePushParamPacket(c *QQClient, _ *network.IncomingPacketInfo, payload [
}
// RegPrxySvc.PbSyncMsg
-func decodeMsgSyncResponse(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeMsgSyncResponse(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := &msf.SvcRegisterProxyMsgResp{}
if err := proto.Unmarshal(payload, rsp); err != nil {
return nil, err
@@ -396,7 +396,7 @@ func decodeMsgSyncResponse(c *QQClient, info *network.IncomingPacketInfo, payloa
}
// OnlinePush.PbC2CMsgSync
-func decodeC2CSyncPacket(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeC2CSyncPacket(c *QQClient, info *network.IncomingPacketInfo, payload []byte) (any, error) {
m := msg.PbPushMsg{}
if err := proto.Unmarshal(payload, &m); err != nil {
return nil, err
@@ -406,7 +406,7 @@ func decodeC2CSyncPacket(c *QQClient, info *network.IncomingPacketInfo, payload
return nil, nil
}
-func decodeMsgReadedResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeMsgReadedResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := msg.PbMsgReadedReportResp{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
@@ -420,7 +420,7 @@ func decodeMsgReadedResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload
var loginNotifyLock sync.Mutex
// StatSvc.SvcReqMSFLoginNotify
-func decodeLoginNotifyPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeLoginNotifyPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
request := &jce.RequestPacket{}
request.ReadFrom(jce.NewJceReader(payload))
data := &jce.RequestDataVersion2{}
@@ -443,7 +443,7 @@ func decodeLoginNotifyPacket(c *QQClient, _ *network.IncomingPacketInfo, payload
t := ac
if ac.AppId == notify.AppId {
c.OnlineClients = append(c.OnlineClients, t)
- c.dispatchOtherClientStatusChangedEvent(&OtherClientStatusChangedEvent{
+ c.OtherClientStatusChangedEvent.dispatch(c, &OtherClientStatusChangedEvent{
Client: t,
Online: true,
})
@@ -462,7 +462,7 @@ func decodeLoginNotifyPacket(c *QQClient, _ *network.IncomingPacketInfo, payload
if rmi != -1 {
rmc := c.OnlineClients[rmi]
c.OnlineClients = append(c.OnlineClients[:rmi], c.OnlineClients[rmi+1:]...)
- c.dispatchOtherClientStatusChangedEvent(&OtherClientStatusChangedEvent{
+ c.OtherClientStatusChangedEvent.dispatch(c, &OtherClientStatusChangedEvent{
Client: rmc,
Online: false,
})
diff --git a/client/system_msg.go b/client/system_msg.go
index e6dbfdd6..c580df53 100644
--- a/client/system_msg.go
+++ b/client/system_msg.go
@@ -60,7 +60,7 @@ func (c *QQClient) GetGroupSystemMessages() (*GroupSystemMessages, error) {
func (c *QQClient) exceptAndDispatchGroupSysMsg() {
if c.groupSysMsgCache == nil {
- c.Error("warning: groupSysMsgCache is nil")
+ c.error("warning: groupSysMsgCache is nil")
c.groupSysMsgCache, _ = c.GetGroupSystemMessages()
return
}
@@ -86,12 +86,12 @@ func (c *QQClient) exceptAndDispatchGroupSysMsg() {
}
for _, msg := range msgs.JoinRequests {
if !joinExists(msg.RequestId) {
- c.dispatchJoinGroupRequest(msg)
+ c.UserWantJoinGroupEvent.dispatch(c, msg)
}
}
for _, msg := range msgs.InvitedRequests {
if !invExists(msg.RequestId) {
- c.dispatchGroupInvitedEvent(msg)
+ c.GroupInvitedEvent.dispatch(c, msg)
}
}
c.groupSysMsgCache = msgs
@@ -190,7 +190,7 @@ func (c *QQClient) buildSystemMsgFriendActionPacket(reqID, requester int64, acce
}
// ProfileService.Pb.ReqSystemMsgNew.Group
-func decodeSystemMsgGroupPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
+func decodeSystemMsgGroupPacket(c *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := structmsg.RspSystemMsgNew{}
if err := proto.Unmarshal(payload, &rsp); err != nil {
return nil, err
@@ -243,12 +243,12 @@ func decodeSystemMsgGroupPacket(c *QQClient, _ *network.IncomingPacketInfo, payl
ActionUinNick: st.Msg.ActionUinQqNick,
})
default:
- c.Debug("unknown group system message type: %v", st.Msg.GroupMsgType)
+ c.debug("unknown group system message type: %v", st.Msg.GroupMsgType)
}
case 3: // ?
case 5: // 自身状态变更(管理员/加群退群)
default:
- c.Debug("unknown group system msg: %v", st.Msg.SubType)
+ c.debug("unknown group system msg: %v", st.Msg.SubType)
}
}
return ret, nil
diff --git a/client/tlv_decoders.go b/client/tlv_decoders.go
index 6337abf4..030e7ee0 100644
--- a/client/tlv_decoders.go
+++ b/client/tlv_decoders.go
@@ -12,16 +12,16 @@ import (
// --- tlv decoders for qq client ---
+/*
func (c *QQClient) decodeT161(data []byte) {
- /*
- reader := binary.NewReader(data)
- reader.ReadBytes(2)
- t := reader.ReadTlvMap(2)
- if t172, ok := t[0x172]; ok {
- c.rollbackSig = t172
- }
- */
+ reader := binary.NewReader(data)
+ reader.ReadBytes(2)
+ t := reader.ReadTlvMap(2)
+ if t172, ok := t[0x172]; ok {
+ c.rollbackSig = t172
+ }
}
+*/
func (c *QQClient) decodeT119(data, ek []byte) {
tea := binary.NewTeaCipher(ek)
@@ -63,32 +63,32 @@ func (c *QQClient) decodeT119(data, ek []byte) {
pt4TokenMap map[string][]byte
)
- if _, ok := m[0x125]; ok {
- // openId, openKey = readT125(t125)
- }
- if t186, ok := m[0x186]; ok {
- c.decodeT186(t186)
- }
if t11a, ok := m[0x11a]; ok {
nick, age, gender = readT11A(t11a)
}
- if _, ok := m[0x199]; ok {
- // openId, payToken = readT199(t199)
- }
- if _, ok := m[0x200]; ok {
- // pf, pfkey = readT200(t200)
- }
+ /*
+ if _, ok := m[0x125]; ok {
+ openId, openKey = readT125(t125)
+ }
+ if t186, ok := m[0x186]; ok {
+ c.decodeT186(t186)
+ }
+ if _, ok := m[0x199]; ok {
+ openId, payToken = readT199(t199)
+ }
+ if _, ok := m[0x200]; ok {
+ pf, pfkey = readT200(t200)
+ }
+ if _, ok := m[0x531]; ok {
+ a1, noPicSig = readT531(t531)
+ }
+ if _, ok := m[0x138]; ok {
+ readT138(t138) // chg time
+ }
+ */
if t512, ok := m[0x512]; ok {
psKeyMap, pt4TokenMap = readT512(t512)
}
- if _, ok := m[0x531]; ok {
- // a1, noPicSig = readT531(t531)
- }
-
- if _, ok := m[0x138]; ok {
- // readT138(t138) // chg time
- }
-
c.oicq.WtSessionTicketKey = utils.Select(m[0x134], c.oicq.WtSessionTicketKey)
// we don't use `c.sigInfo = &auth.SigInfo{...}` here,
@@ -139,11 +139,11 @@ func (c *QQClient) decodeT119R(data []byte) {
if t120, ok := m[0x120]; ok {
c.sig.SKey = t120
c.sig.SKeyExpiredTime = time.Now().Unix() + 21600
- c.Debug("skey updated: %v", c.sig.SKey)
+ c.debug("skey updated: %v", c.sig.SKey)
}
if t11a, ok := m[0x11a]; ok {
c.Nickname, c.Age, c.Gender = readT11A(t11a)
- c.Debug("account info updated: " + c.Nickname)
+ c.debug("account info updated: " + c.Nickname)
}
}
@@ -160,9 +160,11 @@ func (c *QQClient) decodeT113(data []byte) {
fmt.Println("got t113 uin:", uin)
}
+/*
func (c *QQClient) decodeT186(data []byte) {
// c.pwdFlag = data[1] == 1
}
+*/
// --- tlv readers ---
diff --git a/client/translate.go b/client/translate.go
index 946cec49..e0a4bb6b 100644
--- a/client/translate.go
+++ b/client/translate.go
@@ -5,7 +5,6 @@ import (
"github.com/Mrs4s/MiraiGo/client/internal/network"
"github.com/Mrs4s/MiraiGo/client/pb/oidb"
- "github.com/Mrs4s/MiraiGo/internal/proto"
)
func (c *QQClient) buildTranslatePacket(src, dst, text string) (uint16, []byte) {
@@ -16,13 +15,7 @@ func (c *QQClient) buildTranslatePacket(src, dst, text string) (uint16, []byte)
SrcTextList: []string{text},
},
}
- b, _ := proto.Marshal(body)
- req := &oidb.OIDBSSOPkg{
- Command: 2448,
- ServiceType: 2,
- Bodybuffer: b,
- }
- payload, _ := proto.Marshal(req)
+ payload := c.packOIDBPackageProto(2448, 2, body)
return c.uniPacket("OidbSvc.0x990", payload)
}
@@ -41,14 +34,11 @@ func (c *QQClient) Translate(src, dst, text string) (string, error) {
}
// OidbSvc.0x990
-func decodeTranslateResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (interface{}, error) {
- pkg := oidb.OIDBSSOPkg{}
+func decodeTranslateResponse(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
rsp := oidb.TranslateRspBody{}
- if err := proto.Unmarshal(payload, &pkg); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
- }
- if err := proto.Unmarshal(pkg.Bodybuffer, &rsp); err != nil {
- return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
+ err := unpackOIDBPackage(payload, &rsp)
+ if err != nil {
+ return nil, err
}
return rsp.BatchTranslateRsp, nil
}
diff --git a/go.mod b/go.mod
index e265f018..7c3d577d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,10 @@
module github.com/Mrs4s/MiraiGo
-go 1.17
+go 1.18
require (
- github.com/RomiChan/protobuf v0.0.0-20220213164748-44b69c8bdec0
+ github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896
+ github.com/RomiChan/syncx v0.0.0-20220320130821-c88644afda9c
github.com/fumiama/imgsz v0.0.2
github.com/pierrec/lz4/v4 v4.1.11
github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
index dfef8f81..d00f0272 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
-github.com/RomiChan/protobuf v0.0.0-20220213164748-44b69c8bdec0 h1:8CK7Hg+CRGTFhpjvp5V+7wd8/TkuZ6fSuztLVV3bwoQ=
-github.com/RomiChan/protobuf v0.0.0-20220213164748-44b69c8bdec0/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
+github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896 h1:UFAqSbH6VqW5mEzQV2HVB7+p3k9JfTbidWJ/9F15yz0=
+github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
+github.com/RomiChan/syncx v0.0.0-20220320130821-c88644afda9c h1:zHWyqx7A71A/+mlzthPVcVrNGuTPyTpCW3meUPtaULU=
+github.com/RomiChan/syncx v0.0.0-20220320130821-c88644afda9c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/internal/generator/jce_gen/main.go b/internal/generator/jce_gen/main.go
index ed418bd0..3439c0b2 100644
--- a/internal/generator/jce_gen/main.go
+++ b/internal/generator/jce_gen/main.go
@@ -173,7 +173,7 @@ func (g Generator) Generate(w io.Writer) {
}
}
-func assert(cond bool, val interface{}) {
+func assert(cond bool, val any) {
if !cond {
panic("assertion failed: " + fmt.Sprint(val))
}
diff --git a/internal/proto/dynamic.go b/internal/proto/dynamic.go
index c211c05d..a00339de 100644
--- a/internal/proto/dynamic.go
+++ b/internal/proto/dynamic.go
@@ -6,7 +6,7 @@ import (
"math"
)
-type DynamicMessage map[uint64]interface{}
+type DynamicMessage map[uint64]any
type encoder struct {
bytes.Buffer
diff --git a/internal/proto/wrapper.go b/internal/proto/wrapper.go
index c5865421..b43a2ac9 100644
--- a/internal/proto/wrapper.go
+++ b/internal/proto/wrapper.go
@@ -2,7 +2,7 @@ package proto
import "github.com/RomiChan/protobuf/proto"
-type Message = interface{}
+type Message = any
func Marshal(m Message) ([]byte, error) {
return proto.Marshal(m)
diff --git a/message/elements.go b/message/elements.go
index c1d02ee0..c90e6015 100644
--- a/message/elements.go
+++ b/message/elements.go
@@ -103,8 +103,10 @@ type AnimatedSticker struct {
Name string
}
-type RedBagMessageType int
-type AtType int
+type (
+ RedBagMessageType int
+ AtType int
+)
// /com/tencent/mobileqq/data/MessageForQQWalletMsg.java
const (
diff --git a/message/forward.go b/message/forward.go
index 9062f11d..a1226bb2 100644
--- a/message/forward.go
+++ b/message/forward.go
@@ -1,9 +1,9 @@
package message
import (
- "bytes"
"crypto/md5"
"regexp"
+ "strings"
"sync"
"github.com/Mrs4s/MiraiGo/binary"
@@ -14,10 +14,9 @@ import (
// *----- Definitions -----* //
-// ForwardMessage 添加 Node 请用 AddNode 方法
+// ForwardMessage 合并转发消息
type ForwardMessage struct {
Nodes []*ForwardNode
- items []*msg.PbMultiMsgItem
}
type ForwardNode struct {
@@ -72,9 +71,6 @@ func (f *ForwardMessage) AddNode(node *ForwardNode) *ForwardMessage {
if item.Type() != Forward { // quick path
continue
}
- if forward, ok := item.(*ForwardElement); ok {
- f.items = append(f.items, forward.Items...)
- }
}
return f
}
@@ -83,7 +79,7 @@ func (f *ForwardMessage) AddNode(node *ForwardNode) *ForwardMessage {
func (f *ForwardMessage) Length() int { return len(f.Nodes) }
func (f *ForwardMessage) Brief() string {
- var brief bytes.Buffer
+ var brief strings.Builder
for _, n := range f.Nodes {
brief.WriteString(ToReadableString(n.Message))
if brief.Len() >= 27 {
@@ -94,7 +90,7 @@ func (f *ForwardMessage) Brief() string {
}
func (f *ForwardMessage) Preview() string {
- var pv bytes.Buffer
+ var pv strings.Builder
for i, node := range f.Nodes {
if i >= 4 {
break
@@ -109,7 +105,7 @@ func (f *ForwardMessage) Preview() string {
}
func (f *ForwardMessage) CalculateValidationData(seq, random int32, groupCode int64) ([]byte, []byte) {
- msgs := f.packForwardMsg(seq, random, groupCode)
+ msgs := f.PackForwardMessage(seq, random, groupCode)
trans := &msg.PbMultiMsgTransmit{Msg: msgs, PbItemList: []*msg.PbMultiMsgItem{
{
FileName: proto.String("MultiMsg"),
@@ -122,23 +118,7 @@ func (f *ForwardMessage) CalculateValidationData(seq, random int32, groupCode in
return data, hash[:]
}
-// CalculateValidationDataForward 屎代码
-func (f *ForwardMessage) CalculateValidationDataForward(seq, random int32, groupCode int64) ([]byte, []byte, []*msg.PbMultiMsgItem) {
- msgs := f.packForwardMsg(seq, random, groupCode)
- trans := &msg.PbMultiMsgTransmit{Msg: msgs, PbItemList: []*msg.PbMultiMsgItem{
- {
- FileName: proto.String("MultiMsg"),
- Buffer: &msg.PbMultiMsgNew{Msg: msgs},
- },
- }}
- trans.PbItemList = append(trans.PbItemList, f.items...)
- b, _ := proto.Marshal(trans)
- data := binary.GZipCompress(b)
- hash := md5.Sum(data)
- return data, hash[:], trans.PbItemList
-}
-
-func (f *ForwardMessage) packForwardMsg(seq int32, random int32, groupCode int64) []*msg.Message {
+func (f *ForwardMessage) PackForwardMessage(seq int32, random int32, groupCode int64) []*msg.Message {
ml := make([]*msg.Message, 0, len(f.Nodes))
for _, node := range f.Nodes {
ml = append(ml, &msg.Message{
diff --git a/message/image.go b/message/image.go
index 6e596b7e..173153d2 100644
--- a/message/image.go
+++ b/message/image.go
@@ -1,9 +1,8 @@
package message
import (
- "strings"
+ "fmt"
- "github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client/pb/msg"
"github.com/Mrs4s/MiraiGo/internal/proto"
)
@@ -73,7 +72,7 @@ func NewGroupImage(id string, md5 []byte, fid int64, size, width, height, imageT
ImageType: imageType,
Width: width,
Height: height,
- Url: "https://gchat.qpic.cn/gchatpic_new/1/0-0-" + strings.ReplaceAll(binary.CalculateImageResourceId(md5)[1:37], "-", "") + "/0?term=2",
+ Url: fmt.Sprintf("https://gchat.qpic.cn/gchatpic_new/1/0-0-%X/0?term=2", md5),
}
}
diff --git a/message/message.go b/message/message.go
index 201fd169..2cb9673b 100644
--- a/message/message.go
+++ b/message/message.go
@@ -778,7 +778,7 @@ func splitPlainMessage(content string) []IMessageElement {
}
}
if last != len(content) {
- splittedMessage = append(splittedMessage, NewText(content[last:len(content)]))
+ splittedMessage = append(splittedMessage, NewText(content[last:]))
}
return splittedMessage
diff --git a/message/pack.go b/message/pack.go
index 37af9a7c..bb56ad70 100644
--- a/message/pack.go
+++ b/message/pack.go
@@ -1,7 +1,6 @@
package message
import (
- "encoding/hex"
"fmt"
"github.com/Mrs4s/MiraiGo/binary"
@@ -126,7 +125,7 @@ func (e *ShortVideoElement) Pack() (r []*msg.Elem) {
video := &msg.VideoFile{
FileUuid: e.Uuid,
FileMd5: e.Md5,
- FileName: []byte(hex.EncodeToString(e.Md5) + ".mp4"),
+ FileName: []byte(fmt.Sprintf("%x.mp4", e.Md5)),
FileFormat: proto.Int32(3),
FileTime: proto.Int32(10),
FileSize: proto.Int32(e.Size),
diff --git a/topic/feed.go b/topic/feed.go
index b7bfa146..8cb65363 100644
--- a/topic/feed.go
+++ b/topic/feed.go
@@ -55,10 +55,10 @@ type (
pack(patternId string, isPatternData bool) content
}
- content map[string]interface{}
+ content map[string]any
)
-var globalBlockId int64 = 0
+var globalBlockId int64
func genBlockId() string {
id := atomic.AddInt64(&globalBlockId, 1)
diff --git a/utils/http.go b/utils/http.go
index ea594e84..df1caa6c 100644
--- a/utils/http.go
+++ b/utils/http.go
@@ -8,7 +8,7 @@ import (
"strings"
)
-var client = &http.Client{
+var Client = &http.Client{
Transport: &http.Transport{
ForceAttemptHTTP2: true,
MaxConnsPerHost: 0,
@@ -34,7 +34,7 @@ func HttpPostBytes(url string, data []byte) ([]byte, error) {
}
req.Header["User-Agent"] = []string{"QQ/8.2.0.1296 CFNetwork/1126"}
req.Header["Net-Type"] = []string{"Wifi"}
- resp, err := client.Do(req)
+ resp, err := Client.Do(req)
if err != nil {
return nil, err
}
@@ -67,7 +67,7 @@ func HttpPostBytesWithCookie(url string, data []byte, cookie string, contentType
if cookie != "" {
req.Header["Cookie"] = []string{cookie}
}
- resp, err := client.Do(req)
+ resp, err := Client.Do(req)
if err != nil {
return nil, err
}
@@ -125,7 +125,7 @@ func HTTPGetReadCloser(url string, cookie string) (io.ReadCloser, error) {
if cookie != "" {
req.Header["Cookie"] = []string{cookie}
}
- resp, err := client.Do(req)
+ resp, err := Client.Do(req)
if err != nil {
return nil, err
}
diff --git a/utils/string.go b/utils/string.go
index eb702fe4..aa8b236d 100644
--- a/utils/string.go
+++ b/utils/string.go
@@ -1,11 +1,11 @@
package utils
import (
- "encoding/xml"
"math/rand"
"reflect"
"strconv"
"strings"
+ "unicode/utf8"
"unsafe"
)
@@ -69,9 +69,63 @@ func S2B(s string) (b []byte) {
return
}
-// XmlEscape xml escape string
-func XmlEscape(c string) string {
- buf := new(strings.Builder)
- _ = xml.EscapeText(buf, []byte(c))
- return buf.String()
+const (
+ escQuot = """ // shorter than """
+ escApos = "'" // shorter than "'"
+ escAmp = "&"
+ escLT = "<"
+ escGT = ">"
+ escTab = " "
+ escNL = "
"
+ escCR = "
"
+ escFFFD = "\uFFFD" // Unicode replacement character
+)
+
+func isInCharacterRange(r rune) (inrange bool) {
+ return r == 0x09 ||
+ r == 0x0A ||
+ r == 0x0D ||
+ r >= 0x20 && r <= 0xD7FF ||
+ r >= 0xE000 && r <= 0xFFFD ||
+ r >= 0x10000 && r <= 0x10FFFF
+}
+
+// XmlEscape xml escape string
+func XmlEscape(s string) string {
+ var esc string
+ var sb strings.Builder
+ sb.Grow(len(s))
+ last := 0
+ for i, r := range s {
+ width := utf8.RuneLen(r)
+ switch r {
+ case '"':
+ esc = escQuot
+ case '\'':
+ esc = escApos
+ case '&':
+ esc = escAmp
+ case '<':
+ esc = escLT
+ case '>':
+ esc = escGT
+ case '\t':
+ esc = escTab
+ case '\n':
+ esc = escNL
+ case '\r':
+ esc = escCR
+ default:
+ if !isInCharacterRange(r) || (r == 0xFFFD && width == 1) {
+ esc = escFFFD
+ break
+ }
+ continue
+ }
+ sb.WriteString(s[last:i])
+ sb.WriteString(esc)
+ last = i + width
+ }
+ sb.WriteString(s[last:])
+ return sb.String()
}
diff --git a/utils/string_test.go b/utils/string_test.go
new file mode 100644
index 00000000..23310da9
--- /dev/null
+++ b/utils/string_test.go
@@ -0,0 +1,14 @@
+package utils
+
+import (
+ "testing"
+)
+
+func TestXmlEscape(t *testing.T) {
+ input := "A \x00 terminated string."
+ expected := "A \uFFFD terminated string."
+ text := XmlEscape(input)
+ if text != expected {
+ t.Errorf("have %v, want %v", text, expected)
+ }
+}
diff --git a/utils/sys.go b/utils/sys.go
index 7ef22b45..b3b11654 100644
--- a/utils/sys.go
+++ b/utils/sys.go
@@ -20,10 +20,10 @@ func ComputeMd5AndLength(r io.Reader) ([]byte, int64) {
func (r *multiReadSeeker) Read(p []byte) (int, error) {
if r.multiReader == nil {
- var readers []io.Reader
+ readers := make([]io.Reader, len(r.readers))
for i := range r.readers {
_, _ = r.readers[i].Seek(0, io.SeekStart)
- readers = append(readers, r.readers[i])
+ readers[i] = r.readers[i]
}
r.multiReader = io.MultiReader(readers...)
}
@@ -44,59 +44,6 @@ func MultiReadSeeker(r ...io.ReadSeeker) io.ReadSeeker {
}
}
-type multiReadAt struct {
- first io.ReadSeeker
- second io.ReadSeeker
- firstSize int64
- secondSize int64
-}
-
-func (m *multiReadAt) ReadAt(p []byte, off int64) (n int, err error) {
- if m.second == nil { // quick path
- _, _ = m.first.Seek(off, io.SeekStart)
- return m.first.Read(p)
- }
- if off < m.firstSize && off+int64(len(p)) < m.firstSize {
- _, err = m.first.Seek(off, io.SeekStart)
- if err != nil {
- return
- }
- return m.first.Read(p)
- } else if off < m.firstSize && off+int64(len(p)) >= m.firstSize {
- _, _ = m.first.Seek(off, io.SeekStart)
- _, _ = m.second.Seek(0, io.SeekStart)
- n, err = m.first.Read(p[:m.firstSize-off])
- if err != nil {
- return
- }
- n2, err := m.second.Read(p[m.firstSize-off:])
- return n + n2, err
- }
- _, err = m.second.Seek(off-m.firstSize, io.SeekStart)
- if err != nil {
- return
- }
- return m.second.Read(p)
-}
-
-func ReaderAtFrom2ReadSeeker(first, second io.ReadSeeker) io.ReaderAt {
- firstSize, _ := first.Seek(0, io.SeekEnd)
- if second == nil {
- return &multiReadAt{
- first: first,
- firstSize: firstSize,
- secondSize: 0,
- }
- }
- secondSize, _ := second.Seek(0, io.SeekEnd)
- return &multiReadAt{
- first: first,
- second: second,
- firstSize: firstSize,
- secondSize: secondSize,
- }
-}
-
// Select 如果A为nil 将会返回 B 否则返回A
// 对应 ?? 语法
func Select(a, b []byte) []byte {
diff --git a/utils/ttl.go b/utils/ttl.go
index 1b589960..e81228af 100644
--- a/utils/ttl.go
+++ b/utils/ttl.go
@@ -7,26 +7,26 @@ import (
// https://github.com/Konstantin8105/SimpleTTL
// entry - typical element of cache
-type entry struct {
+type entry[T any] struct {
expiry time.Time
- value interface{}
+ value T
}
// Cache - simple implementation of cache
// More information: https://en.wikipedia.org/wiki/Time_to_live
-type Cache struct {
+type Cache[T any] struct {
lock sync.RWMutex
- cache map[string]*entry
+ cache map[string]*entry[T]
}
// NewCache - initialization of new cache.
// For avoid mistake - minimal time to live is 1 minute.
// For simplification, - key is string and cache haven`t stop method
-func NewCache(interval time.Duration) *Cache {
+func NewCache[T any](interval time.Duration) *Cache[T] {
if interval < time.Second {
interval = time.Second
}
- cache := &Cache{cache: make(map[string]*entry)}
+ cache := &Cache[T]{cache: make(map[string]*entry[T])}
go func() {
ticker := time.NewTicker(interval)
for {
@@ -47,7 +47,7 @@ func NewCache(interval time.Duration) *Cache {
}
// Count - return amount element of TTL map.
-func (cache *Cache) Count() int {
+func (cache *Cache[_]) Count() int {
cache.lock.RLock()
defer cache.lock.RUnlock()
@@ -55,19 +55,18 @@ func (cache *Cache) Count() int {
}
// Get - return value from cache
-func (cache *Cache) Get(key string) (interface{}, bool) {
+func (cache *Cache[T]) Get(key string) (value T, _ bool) {
cache.lock.RLock()
defer cache.lock.RUnlock()
e, ok := cache.cache[key]
-
if ok && e.expiry.After(time.Now()) {
return e.value, true
}
- return nil, false
+ return
}
-func (cache *Cache) GetAndUpdate(key string, ttl time.Duration) (interface{}, bool) {
+func (cache *Cache[T]) GetAndUpdate(key string, ttl time.Duration) (_ T, _ bool) {
cache.lock.RLock()
defer cache.lock.RUnlock()
@@ -75,22 +74,22 @@ func (cache *Cache) GetAndUpdate(key string, ttl time.Duration) (interface{}, bo
e.expiry = time.Now().Add(ttl)
return e.value, true
}
- return nil, false
+ return
}
// Add - add key/value in cache
-func (cache *Cache) Add(key string, value interface{}, ttl time.Duration) {
+func (cache *Cache[T]) Add(key string, value T, ttl time.Duration) {
cache.lock.Lock()
defer cache.lock.Unlock()
- cache.cache[key] = &entry{
+ cache.cache[key] = &entry[T]{
value: value,
expiry: time.Now().Add(ttl),
}
}
// GetKeys - return all keys of cache map
-func (cache *Cache) GetKeys() []string {
+func (cache *Cache[_]) GetKeys() []string {
cache.lock.RLock()
defer cache.lock.RUnlock()