mirror of
https://github.com/Mrs4s/MiraiGo.git
synced 2025-05-04 19:17:38 +08:00
feat: upload with sendfile
This commit is contained in:
wdvxdr
parent
8f474db6a3
commit
cdb83e5426
@ -90,38 +90,3 @@ func releaseZlibWriter(w *zlibWriter) {
|
||||
zlibPool.Put(w)
|
||||
}
|
||||
}
|
||||
|
||||
const size128k = 128 * 1024
|
||||
|
||||
var b128kPool = sync.Pool{
|
||||
New: func() interface{} {
|
||||
return make128kSlicePointer()
|
||||
},
|
||||
}
|
||||
|
||||
// Get128KBytes 获取一个128k大小 []byte
|
||||
func Get128KBytes() *[]byte {
|
||||
buf := b128kPool.Get().(*[]byte)
|
||||
if buf == nil {
|
||||
return make128kSlicePointer()
|
||||
}
|
||||
if cap(*buf) < size128k {
|
||||
return make128kSlicePointer()
|
||||
}
|
||||
*buf = (*buf)[:size128k]
|
||||
return buf
|
||||
}
|
||||
|
||||
// Put128KBytes 放回一个128k大小 []byte
|
||||
func Put128KBytes(b *[]byte) {
|
||||
if cap(*b) < size128k || cap(*b) > 2*size128k { // 太大或太小的 []byte 不要放入
|
||||
return
|
||||
}
|
||||
*b = (*b)[:cap(*b)]
|
||||
b128kPool.Put(b)
|
||||
}
|
||||
|
||||
func make128kSlicePointer() *[]byte {
|
||||
data := make([]byte, size128k)
|
||||
return &data
|
||||
}
|
||||
|
||||
@ -3,14 +3,12 @@ package binary
|
||||
import (
|
||||
"encoding/binary"
|
||||
"math/rand"
|
||||
"reflect"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
func xorQ(a, b []byte, c []byte) { // MAGIC
|
||||
*(*uint64)(unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(&c)).Data)) =
|
||||
*(*uint64)(unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(&a)).Data)) ^
|
||||
*(*uint64)(unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(&b)).Data))
|
||||
*(*uint64)(unsafe.Pointer(&c[0])) =
|
||||
*(*uint64)(unsafe.Pointer(&a[0])) ^ *(*uint64)(unsafe.Pointer(&b[0]))
|
||||
}
|
||||
|
||||
type TEA [4]uint32
|
||||
|
||||
@ -37,71 +37,52 @@ func (c *QQClient) highwayUploadStream(ip uint32, port int, updKey []byte, strea
|
||||
h := md5.New()
|
||||
length, _ := io.Copy(h, stream)
|
||||
fh := h.Sum(nil)
|
||||
const chunkSize = 8192 * 8
|
||||
_, _ = stream.Seek(0, io.SeekStart)
|
||||
conn, err := net.DialTCP("tcp", nil, &addr)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "connect error")
|
||||
}
|
||||
defer conn.Close()
|
||||
offset := 0
|
||||
reader := binary.NewNetworkReader(conn)
|
||||
chunk := *binary.Get128KBytes()
|
||||
defer func() { // 延迟捕获 chunk
|
||||
binary.Put128KBytes(&chunk)
|
||||
}()
|
||||
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
|
||||
MsgBasehead: &pb.DataHighwayHead{
|
||||
Version: 1,
|
||||
Uin: strconv.FormatInt(c.Uin, 10),
|
||||
Command: "PicUp.DataUp",
|
||||
Seq: c.nextGroupDataTransSeq(),
|
||||
Appid: int32(c.version.AppId),
|
||||
Dataflag: 4096,
|
||||
CommandId: cmdId,
|
||||
LocaleId: 2052,
|
||||
},
|
||||
MsgSeghead: &pb.SegHead{
|
||||
Filesize: length,
|
||||
Dataoffset: int64(0),
|
||||
Datalength: int32(length),
|
||||
Serviceticket: updKey,
|
||||
Md5: fh,
|
||||
FileMd5: fh,
|
||||
},
|
||||
ReqExtendinfo: EmptyBytes,
|
||||
})
|
||||
w := binary.NewWriter()
|
||||
defer binary.PutBuffer(w)
|
||||
for {
|
||||
chunk = chunk[:chunkSize]
|
||||
rl, err := io.ReadFull(stream, chunk)
|
||||
if errors.Is(err, io.EOF) {
|
||||
break
|
||||
}
|
||||
if errors.Is(err, io.ErrUnexpectedEOF) {
|
||||
chunk = chunk[:rl]
|
||||
}
|
||||
ch := md5.Sum(chunk)
|
||||
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
|
||||
MsgBasehead: &pb.DataHighwayHead{
|
||||
Version: 1,
|
||||
Uin: strconv.FormatInt(c.Uin, 10),
|
||||
Command: "PicUp.DataUp",
|
||||
Seq: c.nextGroupDataTransSeq(),
|
||||
Appid: int32(c.version.AppId),
|
||||
Dataflag: 4096,
|
||||
CommandId: cmdId,
|
||||
LocaleId: 2052,
|
||||
},
|
||||
MsgSeghead: &pb.SegHead{
|
||||
Filesize: length,
|
||||
Dataoffset: int64(offset),
|
||||
Datalength: int32(rl),
|
||||
Serviceticket: updKey,
|
||||
Md5: ch[:],
|
||||
FileMd5: fh,
|
||||
},
|
||||
ReqExtendinfo: EmptyBytes,
|
||||
})
|
||||
offset += rl
|
||||
w.Reset()
|
||||
w.WriteByte(40)
|
||||
w.WriteUInt32(uint32(len(head)))
|
||||
w.WriteUInt32(uint32(len(chunk)))
|
||||
w.Write(head)
|
||||
w.Write(chunk)
|
||||
w.WriteByte(41)
|
||||
_, err = conn.Write(w.Bytes())
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "write conn error")
|
||||
}
|
||||
rspHead, _, err := highwayReadResponse(reader)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "highway upload error")
|
||||
}
|
||||
if rspHead.ErrorCode != 0 {
|
||||
return errors.New("upload failed")
|
||||
}
|
||||
w.WriteByte(40)
|
||||
w.WriteUInt32(uint32(len(head)))
|
||||
w.WriteUInt32(uint32(length))
|
||||
w.Write(head)
|
||||
_, _ = conn.Write(w.Bytes())
|
||||
_, _ = conn.ReadFrom(stream)
|
||||
_, err = conn.Write([]byte{41})
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "write conn error")
|
||||
}
|
||||
rspHead, _, err := highwayReadResponse(reader)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "highway upload error")
|
||||
}
|
||||
if rspHead.ErrorCode != 0 {
|
||||
return errors.New("upload failed")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -116,13 +97,11 @@ func (c *QQClient) highwayUploadByBDH(stream io.Reader, length int64, cmdId int3
|
||||
}
|
||||
ext = binary.NewTeaCipher(c.highwaySession.SessionKey).Encrypt(ext)
|
||||
}
|
||||
const chunkSize = 8192 * 16
|
||||
conn, err := net.DialTimeout("tcp", c.srvSsoAddrs[0], time.Second*20)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "connect error")
|
||||
}
|
||||
defer conn.Close()
|
||||
offset := 0
|
||||
reader := binary.NewNetworkReader(conn)
|
||||
if err = c.highwaySendHeartbreak(conn); err != nil {
|
||||
return nil, errors.Wrap(err, "echo error")
|
||||
@ -131,68 +110,52 @@ func (c *QQClient) highwayUploadByBDH(stream io.Reader, length int64, cmdId int3
|
||||
return nil, errors.Wrap(err, "echo error")
|
||||
}
|
||||
var rspExt []byte
|
||||
chunk := *binary.Get128KBytes()
|
||||
defer func() { // 延迟捕获 chunk
|
||||
binary.Put128KBytes(&chunk)
|
||||
}()
|
||||
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
|
||||
MsgBasehead: &pb.DataHighwayHead{
|
||||
Version: 1,
|
||||
Uin: strconv.FormatInt(c.Uin, 10),
|
||||
Command: "PicUp.DataUp",
|
||||
Seq: c.nextGroupDataTransSeq(),
|
||||
Appid: int32(c.version.AppId),
|
||||
Dataflag: 4096,
|
||||
CommandId: cmdId,
|
||||
LocaleId: 2052,
|
||||
},
|
||||
MsgSeghead: &pb.SegHead{
|
||||
Filesize: length,
|
||||
Dataoffset: int64(0),
|
||||
Datalength: int32(length),
|
||||
Serviceticket: ticket,
|
||||
Md5: sum,
|
||||
FileMd5: sum,
|
||||
},
|
||||
ReqExtendinfo: ext,
|
||||
})
|
||||
w := binary.NewWriter()
|
||||
defer binary.PutBuffer(w)
|
||||
for {
|
||||
chunk = chunk[:chunkSize]
|
||||
rl, err := io.ReadFull(stream, chunk)
|
||||
if errors.Is(err, io.EOF) {
|
||||
break
|
||||
}
|
||||
if errors.Is(err, io.ErrUnexpectedEOF) {
|
||||
chunk = chunk[:rl]
|
||||
}
|
||||
ch := md5.Sum(chunk)
|
||||
head, _ := proto.Marshal(&pb.ReqDataHighwayHead{
|
||||
MsgBasehead: &pb.DataHighwayHead{
|
||||
Version: 1,
|
||||
Uin: strconv.FormatInt(c.Uin, 10),
|
||||
Command: "PicUp.DataUp",
|
||||
Seq: c.nextGroupDataTransSeq(),
|
||||
Appid: int32(c.version.AppId),
|
||||
Dataflag: 4096,
|
||||
CommandId: cmdId,
|
||||
LocaleId: 2052,
|
||||
},
|
||||
MsgSeghead: &pb.SegHead{
|
||||
Filesize: length,
|
||||
Dataoffset: int64(offset),
|
||||
Datalength: int32(rl),
|
||||
Serviceticket: ticket,
|
||||
Md5: ch[:],
|
||||
FileMd5: sum,
|
||||
},
|
||||
ReqExtendinfo: ext,
|
||||
})
|
||||
offset += rl
|
||||
w.Reset()
|
||||
w.WriteByte(40)
|
||||
w.WriteUInt32(uint32(len(head)))
|
||||
w.WriteUInt32(uint32(len(chunk)))
|
||||
w.Write(head)
|
||||
w.Write(chunk)
|
||||
w.WriteByte(41)
|
||||
_, err = conn.Write(w.Bytes())
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "write conn error")
|
||||
}
|
||||
rspHead, _, err := highwayReadResponse(reader)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "highway upload error")
|
||||
}
|
||||
if rspHead.ErrorCode != 0 {
|
||||
return nil, errors.Errorf("upload failed: %d", rspHead.ErrorCode)
|
||||
}
|
||||
if rspHead.RspExtendinfo != nil {
|
||||
rspExt = rspHead.RspExtendinfo
|
||||
}
|
||||
if rspHead.MsgSeghead != nil && rspHead.MsgSeghead.Serviceticket != nil {
|
||||
ticket = rspHead.MsgSeghead.Serviceticket
|
||||
}
|
||||
w.Reset()
|
||||
w.WriteByte(40)
|
||||
w.WriteUInt32(uint32(len(head)))
|
||||
w.WriteUInt32(uint32(length))
|
||||
w.Write(head)
|
||||
_, _ = conn.Write(w.Bytes())
|
||||
_, _ = io.Copy(conn, stream)
|
||||
_, err = conn.Write([]byte{41})
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "write conn error")
|
||||
}
|
||||
rspHead, _, err := highwayReadResponse(reader)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "highway upload error")
|
||||
}
|
||||
if rspHead.ErrorCode != 0 {
|
||||
return nil, errors.Errorf("upload failed: %d", rspHead.ErrorCode)
|
||||
}
|
||||
if rspHead.RspExtendinfo != nil {
|
||||
rspExt = rspHead.RspExtendinfo
|
||||
}
|
||||
if rspHead.MsgSeghead != nil && rspHead.MsgSeghead.Serviceticket != nil {
|
||||
ticket = rspHead.MsgSeghead.Serviceticket
|
||||
}
|
||||
return rspExt, nil
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ func (c *QQClient) UploadGroupImage(groupCode int64, img io.ReadSeeker) (*messag
|
||||
c.srvSsoAddrs = append(c.srvSsoAddrs, fmt.Sprintf("%v:%v", binary.UInt32ToIPV4Address(uint32(addr)), rsp.UploadPort[i]))
|
||||
}
|
||||
}
|
||||
if _, err = c.highwayUploadByBDH(img, length, 2, rsp.UploadKey, EmptyBytes, fh, false); err == nil {
|
||||
if _, err = c.highwayUploadByBDH(img, length, 2, rsp.UploadKey, fh, EmptyBytes, false); err == nil {
|
||||
goto ok
|
||||
}
|
||||
return nil, errors.Wrap(err, "upload failed")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user