shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into reflection-based-protobuf

Browse Source 
# Conflicts:
#	client/builders.go
#	client/global.go
This commit is contained in:
wdvxdr 2021-11-11 19:32:13 +08:00
parent 44393e904d
commit 0f149a925f
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/builders.go
View File

@ -7,10 +7,6 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/Mrs4s/MiraiGo/internal/crypto"
"github.com/Mrs4s/MiraiGo/internal/packets"
"github.com/Mrs4s/MiraiGo/internal/tlv"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary"

9
client/global.go
View File

@ -5,7 +5,6 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/Mrs4s/MiraiGo/internal/protobuf/data/oidb"
"math/rand" "math/rand"
"net" "net"
"sort" "sort"
@ -13,14 +12,16 @@ import (
"strings" "strings"
"time" "time"
proto2 "github.com/Mrs4s/MiraiGo/internal/protobuf/proto"
"github.com/pkg/errors" "github.com/pkg/errors"
protobuf "github.com/segmentio/encoding/proto"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/binary/jce"
devinfo "github.com/Mrs4s/MiraiGo/client/pb" devinfo "github.com/Mrs4s/MiraiGo/client/pb"
"github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/msg"
"github.com/Mrs4s/MiraiGo/internal/protobuf/data/oidb"
proto2 "github.com/Mrs4s/MiraiGo/internal/protobuf/proto"
"github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
) )
@ -655,7 +656,7 @@ func (c *QQClient) packOIDBPackage(cmd, serviceType uint32, body []byte) []byte
return r return r
} }
func (c *QQClient) packOIDBPackageDynamically(cmd, serviceType int32, msg binary.DynamicProtoMessage) []byte { func (c *QQClient) packOIDBPackageDynamically(cmd, serviceType uint32, msg binary.DynamicProtoMessage) []byte {
return c.packOIDBPackage(cmd, serviceType, msg.Encode()) return c.packOIDBPackage(cmd, serviceType, msg.Encode())
} }
@ -671,7 +672,7 @@ func (c *QQClient) packOIDBPackageProto2(cmd, serviceType uint32, msg proto2.Mes
func (c *QQClient) unpackOIDBPackage(buff []byte, payload proto.Message) error { func (c *QQClient) unpackOIDBPackage(buff []byte, payload proto.Message) error {
pkg := new(oidb.OIDBSSOPkg) pkg := new(oidb.OIDBSSOPkg)
if err := proto.Unmarshal(buff, pkg); err != nil { if err := protobuf.Unmarshal(buff, pkg); err != nil {
return errors.Wrap(err, "failed to unmarshal protobuf message") return errors.Wrap(err, "failed to unmarshal protobuf message")
} }
if pkg.GetResult() != 0 { if pkg.GetResult() != 0 {