shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-07-01 20:23:26 +00:00
Code Issues Projects Releases Wiki Activity

internal/proto: move binary.DynamicProtoMessage to proto.DynamicMessage

Browse Source
This commit is contained in:
wdvxdr
2022-02-10 21:55:27 +08:00
parent 5d071b034c
commit 28637c41be
6 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/global.go
View File

@ -321,7 +321,7 @@ func (c *QQClient) packOIDBPackage(cmd, serviceType int32, body []byte) []byte {
return r return r
} }
func (c *QQClient) packOIDBPackageDynamically(cmd, serviceType int32, msg binary.DynamicProtoMessage) []byte { func (c *QQClient) packOIDBPackageDynamically(cmd, serviceType int32, msg proto.DynamicMessage) []byte {
return c.packOIDBPackage(cmd, serviceType, msg.Encode()) return c.packOIDBPackage(cmd, serviceType, msg.Encode())
} }

57
client/guild.go
View File

@ -15,7 +15,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client/pb/channel" "github.com/Mrs4s/MiraiGo/client/pb/channel"
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
) )
@ -176,13 +175,13 @@ func (g *GuildInfo) removeChannel(id uint64) {
} }
func (s *GuildService) GetUserProfile(tinyId uint64) (*GuildUserProfile, error) { func (s *GuildService) GetUserProfile(tinyId uint64) (*GuildUserProfile, error) {
flags := binary.DynamicProtoMessage{} flags := proto.DynamicMessage{}
for i := 3; i <= 29; i++ { for i := 3; i <= 29; i++ {
flags[uint64(i)] = uint32(1) flags[uint64(i)] = uint32(1)
} }
flags[99] = uint32(1) flags[99] = uint32(1)
flags[100] = uint32(1) flags[100] = uint32(1)
payload := s.c.packOIDBPackageDynamically(3976, 1, binary.DynamicProtoMessage{ payload := s.c.packOIDBPackageDynamically(3976, 1, proto.DynamicMessage{
1: flags, 1: flags,
3: tinyId, 3: tinyId,
4: uint32(0), 4: uint32(0),
@ -210,11 +209,11 @@ func (s *GuildService) GetUserProfile(tinyId uint64) (*GuildUserProfile, error)
func (s *GuildService) FetchGuildMemberListWithRole(guildId, channelId uint64, startIndex uint32, roleIdIndex uint64, param string) (*FetchGuildMemberListWithRoleResult, error) { func (s *GuildService) FetchGuildMemberListWithRole(guildId, channelId uint64, startIndex uint32, roleIdIndex uint64, param string) (*FetchGuildMemberListWithRoleResult, error) {
seq := s.c.nextSeq() seq := s.c.nextSeq()
u1 := uint32(1) u1 := uint32(1)
m := binary.DynamicProtoMessage{ m := proto.DynamicMessage{
1: guildId, // guild id 1: guildId, // guild id
2: uint32(3), 2: uint32(3),
3: uint32(0), 3: uint32(0),
4: binary.DynamicProtoMessage{ // unknown param, looks like flags 4: proto.DynamicMessage{ // unknown param, looks like flags
1: u1, 2: u1, 3: u1, 4: u1, 5: u1, 6: u1, 7: u1, 8: u1, 20: u1, 1: u1, 2: u1, 3: u1, 4: u1, 5: u1, 6: u1, 7: u1, 8: u1, 20: u1,
}, },
6: startIndex, 6: startIndex,
@ -269,13 +268,13 @@ func (s *GuildService) FetchGuildMemberListWithRole(guildId, channelId uint64, s
// FetchGuildMemberProfileInfo 获取单个频道成员资料 // FetchGuildMemberProfileInfo 获取单个频道成员资料
func (s *GuildService) FetchGuildMemberProfileInfo(guildId, tinyId uint64) (*GuildUserProfile, error) { func (s *GuildService) FetchGuildMemberProfileInfo(guildId, tinyId uint64) (*GuildUserProfile, error) {
seq := s.c.nextSeq() seq := s.c.nextSeq()
flags := binary.DynamicProtoMessage{} flags := proto.DynamicMessage{}
for i := 3; i <= 29; i++ { for i := 3; i <= 29; i++ {
flags[uint64(i)] = uint32(1) flags[uint64(i)] = uint32(1)
} }
flags[99] = uint32(1) flags[99] = uint32(1)
flags[100] = uint32(1) flags[100] = uint32(1)
payload := s.c.packOIDBPackageDynamically(3976, 1, binary.DynamicProtoMessage{ payload := s.c.packOIDBPackageDynamically(3976, 1, proto.DynamicMessage{
1: flags, 1: flags,
3: tinyId, 3: tinyId,
4: guildId, 4: guildId,
@ -305,7 +304,7 @@ func (s *GuildService) FetchGuildMemberProfileInfo(guildId, tinyId uint64) (*Gui
func (s *GuildService) GetGuildRoles(guildId uint64) ([]*GuildRole, error) { func (s *GuildService) GetGuildRoles(guildId uint64) ([]*GuildRole, error) {
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1019_1", seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1019_1",
s.c.packOIDBPackageDynamically(4121, 1, binary.DynamicProtoMessage{1: guildId})) s.c.packOIDBPackageDynamically(4121, 1, proto.DynamicMessage{1: guildId}))
rsp, err := s.c.sendAndWaitDynamic(seq, packet) rsp, err := s.c.sendAndWaitDynamic(seq, packet)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "send packet error") return nil, errors.Wrap(err, "send packet error")
@ -332,14 +331,14 @@ func (s *GuildService) GetGuildRoles(guildId uint64) ([]*GuildRole, error) {
func (s *GuildService) CreateGuildRole(guildId uint64, name string, color uint32, independent bool, initialUsers []uint64) (uint64, error) { func (s *GuildService) CreateGuildRole(guildId uint64, name string, color uint32, independent bool, initialUsers []uint64) (uint64, error) {
u1 := uint32(1) u1 := uint32(1)
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1016_1", s.c.packOIDBPackageDynamically(4118, 1, binary.DynamicProtoMessage{ seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1016_1", s.c.packOIDBPackageDynamically(4118, 1, proto.DynamicMessage{
1: guildId, 1: guildId,
2: binary.DynamicProtoMessage{ // todo: 未知参数 2: proto.DynamicMessage{ // todo: 未知参数
1: u1, 1: u1,
2: u1, 2: u1,
3: u1, 3: u1,
}, },
3: binary.DynamicProtoMessage{ 3: proto.DynamicMessage{
1: name, 1: name,
2: color, 2: color,
3: independent, 3: independent,
@ -358,7 +357,7 @@ func (s *GuildService) CreateGuildRole(guildId uint64, name string, color uint32
} }
func (s *GuildService) DeleteGuildRole(guildId uint64, roleId uint64) error { func (s *GuildService) DeleteGuildRole(guildId uint64, roleId uint64) error {
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x100e_1", s.c.packOIDBPackageDynamically(4110, 1, binary.DynamicProtoMessage{ seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x100e_1", s.c.packOIDBPackageDynamically(4110, 1, proto.DynamicMessage{
1: guildId, 1: guildId,
2: roleId, 2: roleId,
})) }))
@ -370,7 +369,7 @@ func (s *GuildService) DeleteGuildRole(guildId uint64, roleId uint64) error {
} }
func (s *GuildService) SetUserRoleInGuild(guildId uint64, set bool, roleId uint64, user []uint64) error { // remove => p2 = false func (s *GuildService) SetUserRoleInGuild(guildId uint64, set bool, roleId uint64, user []uint64) error { // remove => p2 = false
setOrRemove := binary.DynamicProtoMessage{ setOrRemove := proto.DynamicMessage{
1: roleId, 1: roleId,
} }
if set { if set {
@ -378,7 +377,7 @@ func (s *GuildService) SetUserRoleInGuild(guildId uint64, set bool, roleId uint6
} else { } else {
setOrRemove[3] = user setOrRemove[3] = user
} }
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x101a_1", s.c.packOIDBPackageDynamically(4122, 1, binary.DynamicProtoMessage{ seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x101a_1", s.c.packOIDBPackageDynamically(4122, 1, proto.DynamicMessage{
1: guildId, 1: guildId,
2: setOrRemove, 2: setOrRemove,
})) }))
@ -391,15 +390,15 @@ func (s *GuildService) SetUserRoleInGuild(guildId uint64, set bool, roleId uint6
func (s *GuildService) ModifyRoleInGuild(guildId uint64, roleId uint64, name string, color uint32, indepedent bool) error { func (s *GuildService) ModifyRoleInGuild(guildId uint64, roleId uint64, name string, color uint32, indepedent bool) error {
u1 := uint32(1) u1 := uint32(1)
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x100d_1", s.c.packOIDBPackageDynamically(4109, 1, binary.DynamicProtoMessage{ seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x100d_1", s.c.packOIDBPackageDynamically(4109, 1, proto.DynamicMessage{
1: guildId, 1: guildId,
2: roleId, 2: roleId,
3: binary.DynamicProtoMessage{ 3: proto.DynamicMessage{
1: u1, 1: u1,
2: u1, 2: u1,
3: u1, 3: u1,
}, },
4: binary.DynamicProtoMessage{ 4: proto.DynamicMessage{
1: name, 1: name,
2: color, 2: color,
3: indepedent, 3: indepedent,
@ -414,17 +413,17 @@ func (s *GuildService) ModifyRoleInGuild(guildId uint64, roleId uint64, name str
func (s *GuildService) FetchGuestGuild(guildId uint64) (*GuildMeta, error) { func (s *GuildService) FetchGuestGuild(guildId uint64) (*GuildMeta, error) {
u1 := uint32(1) u1 := uint32(1)
payload := s.c.packOIDBPackageDynamically(3927, 9, binary.DynamicProtoMessage{ payload := s.c.packOIDBPackageDynamically(3927, 9, proto.DynamicMessage{
1: binary.DynamicProtoMessage{ 1: proto.DynamicMessage{
1: binary.DynamicProtoMessage{ 1: proto.DynamicMessage{
2: u1, 4: u1, 5: u1, 6: u1, 7: u1, 8: u1, 11: u1, 12: u1, 13: u1, 14: u1, 45: u1, 2: u1, 4: u1, 5: u1, 6: u1, 7: u1, 8: u1, 11: u1, 12: u1, 13: u1, 14: u1, 45: u1,
18: u1, 19: u1, 20: u1, 22: u1, 23: u1, 5002: u1, 5003: u1, 5004: u1, 5005: u1, 10007: u1, 18: u1, 19: u1, 20: u1, 22: u1, 23: u1, 5002: u1, 5003: u1, 5004: u1, 5005: u1, 10007: u1,
}, },
2: binary.DynamicProtoMessage{ 2: proto.DynamicMessage{
3: u1, 4: u1, 6: u1, 11: u1, 14: u1, 15: u1, 16: u1, 17: u1, 3: u1, 4: u1, 6: u1, 11: u1, 14: u1, 15: u1, 16: u1, 17: u1,
}, },
}, },
2: binary.DynamicProtoMessage{ 2: proto.DynamicMessage{
1: guildId, 1: guildId,
}, },
}) })
@ -452,9 +451,9 @@ func (s *GuildService) FetchGuestGuild(guildId uint64) (*GuildMeta, error) {
func (s *GuildService) FetchChannelList(guildId uint64) (r []*ChannelInfo, e error) { func (s *GuildService) FetchChannelList(guildId uint64) (r []*ChannelInfo, e error) {
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0xf5d_1", seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0xf5d_1",
s.c.packOIDBPackageDynamically(3933, 1, s.c.packOIDBPackageDynamically(3933, 1,
binary.DynamicProtoMessage{ proto.DynamicMessage{
1: guildId, 1: guildId,
3: binary.DynamicProtoMessage{ 3: proto.DynamicMessage{
1: uint32(1), 1: uint32(1),
}, },
})) }))
@ -473,7 +472,7 @@ func (s *GuildService) FetchChannelList(guildId uint64) (r []*ChannelInfo, e err
} }
func (s *GuildService) FetchChannelInfo(guildId, channelId uint64) (*ChannelInfo, error) { func (s *GuildService) FetchChannelInfo(guildId, channelId uint64) (*ChannelInfo, error) {
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0xf55_1", s.c.packOIDBPackageDynamically(3925, 1, binary.DynamicProtoMessage{1: guildId, 2: channelId})) seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0xf55_1", s.c.packOIDBPackageDynamically(3925, 1, proto.DynamicMessage{1: guildId, 2: channelId}))
rsp, err := s.c.sendAndWaitDynamic(seq, packet) rsp, err := s.c.sendAndWaitDynamic(seq, packet)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "send packet error") return nil, errors.Wrap(err, "send packet error")
@ -618,10 +617,10 @@ func (s *GuildService) PostTopicChannelFeed(guildId, channelId uint64, feed *top
func (s *GuildService) fetchMemberRoles(guildId uint64, tinyId uint64) ([]*GuildRole, error) { func (s *GuildService) fetchMemberRoles(guildId uint64, tinyId uint64) ([]*GuildRole, error) {
u1 := uint32(1) u1 := uint32(1)
seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1017_1", s.c.packOIDBPackageDynamically(4119, 1, binary.DynamicProtoMessage{ seq, packet := s.c.uniPacket("OidbSvcTrpcTcp.0x1017_1", s.c.packOIDBPackageDynamically(4119, 1, proto.DynamicMessage{
1: guildId, 1: guildId,
2: tinyId, 2: tinyId,
4: binary.DynamicProtoMessage{ 4: proto.DynamicMessage{
1: u1, 1: u1,
2: u1, 2: u1,
3: u1, 3: u1,
@ -657,8 +656,8 @@ func (s *GuildService) fetchChannelListState(guildId uint64, channels []*Channel
for _, info := range channels { for _, info := range channels {
ids = append(ids, info.ChannelId) ids = append(ids, info.ChannelId)
} }
payload := s.c.packOIDBPackageDynamically(4104, 1, binary.DynamicProtoMessage{ payload := s.c.packOIDBPackageDynamically(4104, 1, binary.DynamicMessage{
1: binary.DynamicProtoMessage{ 1: binary.DynamicMessage{
1: guildId, 1: guildId,
2: ids, 2: ids,
}, },

3
client/guild_msg.go
View File

@ -10,7 +10,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client/internal/highway" "github.com/Mrs4s/MiraiGo/client/internal/highway"
"github.com/Mrs4s/MiraiGo/client/internal/network" "github.com/Mrs4s/MiraiGo/client/internal/network"
"github.com/Mrs4s/MiraiGo/client/pb/channel" "github.com/Mrs4s/MiraiGo/client/pb/channel"
@ -139,7 +138,7 @@ func (s *GuildService) UploadGuildImage(guildId, channelId uint64, img io.ReadSe
CommandID: 83, CommandID: 83,
Body: img, Body: img,
Ticket: body.UploadKey, Ticket: body.UploadKey,
Ext: binary.DynamicProtoMessage{11: guildId, 12: channelId}.Encode(), Ext: proto.DynamicMessage{11: guildId, 12: channelId}.Encode(),
Encrypt: false, Encrypt: false,
}); err == nil { }); err == nil {
goto ok goto ok

9
binary/protobuf.go → internal/proto/dynamic.go
View File

@ -1,4 +1,4 @@
package binary package proto
import ( import (
"bytes" "bytes"
@ -6,15 +6,14 @@ import (
"math" "math"
) )
type DynamicProtoMessage map[uint64]interface{} type DynamicMessage map[uint64]interface{}
type encoder struct { type encoder struct {
bytes.Buffer bytes.Buffer
} }
func (msg DynamicProtoMessage) Encode() []byte { func (msg DynamicMessage) Encode() []byte {
en := &encoder{} en := &encoder{}
//nolint:staticcheck //nolint:staticcheck
for id, value := range msg { for id, value := range msg {
key := id << 3 key := id << 3
@ -61,7 +60,7 @@ func (msg DynamicProtoMessage) Encode() []byte {
en.uvarint(key | 2) en.uvarint(key | 2)
en.uvarint(uint64(len(v))) en.uvarint(uint64(len(v)))
_, _ = en.Write(v) _, _ = en.Write(v)
case DynamicProtoMessage: case DynamicMessage:
en.uvarint(key | 2) en.uvarint(key | 2)
b := v.Encode() b := v.Encode()
en.uvarint(uint64(len(b))) en.uvarint(uint64(len(b)))

2
binary/protobuf_test.go → internal/proto/dynamic_test.go
View File

@ -1,4 +1,4 @@
package binary package proto
import ( import (
"math" "math"

2
message/image.go
View File

@ -190,7 +190,7 @@ func (e *GuildImageElement) Pack() (r []*msg.Elem) {
ImageType: &e.ImageType, ImageType: &e.ImageType,
Size: &e.Size, Size: &e.Size,
Md5: e.Md5, Md5: e.Md5,
PbReserve: binary.DynamicProtoMessage{ PbReserve: proto.DynamicMessage{
1: uint32(0), 2: uint32(0), 6: "", 10: uint32(0), 15: uint32(8), 1: uint32(0), 2: uint32(0), 6: "", 10: uint32(0), 15: uint32(8),
20: e.DownloadIndex, 20: e.DownloadIndex,
}.Encode(), }.Encode(),