Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
3e6c7bc6
Commit
3e6c7bc6
authored
Mar 21, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle `StatSvc.ReqMSFOffline`, fix #150
parent
40f15797
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
74 additions
and
10 deletions
+74
-10
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt
...droid/network/protocol/data/jce/RequestMSFForceOffline.kt
+25
-0
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
.../mirai/qqandroid/network/protocol/packet/PacketFactory.kt
+2
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/StatSvc.kt
.../mirai/qqandroid/network/protocol/packet/login/StatSvc.kt
+47
-8
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt
0 → 100644
View file @
3e6c7bc6
package
net.mamoe.mirai.qqandroid.network.protocol.data.jce
import
kotlinx.serialization.Serializable
import
net.mamoe.mirai.qqandroid.io.JceStruct
import
net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable
internal
class
RequestMSFForceOffline
(
@JceId
(
0
)
val
uin
:
Long
=
0L
,
@JceId
(
1
)
val
iSeqno
:
Long
=
0L
,
@JceId
(
2
)
val
kickType
:
Byte
=
0
,
@JceId
(
3
)
val
info
:
String
=
""
,
@JceId
(
4
)
val
title
:
String
?
=
""
,
@JceId
(
5
)
val
sigKick
:
Byte
?
=
0
,
@JceId
(
6
)
val
vecSigKickData
:
ByteArray
?
=
null
,
@JceId
(
7
)
val
sameDevice
:
Byte
?
=
0
)
:
JceStruct
@Serializable
internal
class
RspMSFForceOffline
(
@JceId
(
0
)
val
uin
:
Long
,
@JceId
(
1
)
val
seq
:
Long
,
@JceId
(
2
)
val
const
:
Byte
=
0
)
:
JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
View file @
3e6c7bc6
...
@@ -152,8 +152,8 @@ internal object KnownPacketFactories {
...
@@ -152,8 +152,8 @@ internal object KnownPacketFactories {
OnlinePush
.
ReqPush
,
OnlinePush
.
ReqPush
,
OnlinePush
.
PbPushTransMsg
,
OnlinePush
.
PbPushTransMsg
,
MessageSvc
.
PushNotify
,
MessageSvc
.
PushNotify
,
ConfigPushSvc
.
PushReq
ConfigPushSvc
.
PushReq
,
StatSvc
.
ReqMSFOffline
)
)
// SvcReqMSFLoginNotify 自己的其他设备上限
// SvcReqMSFLoginNotify 自己的其他设备上限
// MessageSvc.PushReaded 电脑阅读了别人的消息, 告知手机
// MessageSvc.PushReaded 电脑阅读了别人的消息, 告知手机
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/StatSvc.kt
View file @
3e6c7bc6
...
@@ -11,17 +11,17 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.login
...
@@ -11,17 +11,17 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.login
import
kotlinx.io.core.ByteReadPacket
import
kotlinx.io.core.ByteReadPacket
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.event.events.BotOfflineEvent
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.io.serialization.*
import
net.mamoe.mirai.qqandroid.io.serialization.*
import
net.mamoe.mirai.qqandroid.network.QQAndroidClient
import
net.mamoe.mirai.qqandroid.network.QQAndroidClient
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestMSFForceOffline
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.RspMSFForceOffline
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.SvcReqRegister
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.SvcReqRegister
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x769
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x769
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.StatSvcGetOnline
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.StatSvcGetOnline
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.*
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import
net.mamoe.mirai.qqandroid.network.protocol.packet.buildLoginOutgoingPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.writeSsoPacket
import
net.mamoe.mirai.qqandroid.utils.NetworkType
import
net.mamoe.mirai.qqandroid.utils.NetworkType
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiPlatformUtils
import
net.mamoe.mirai.utils.MiraiPlatformUtils
...
@@ -81,7 +81,6 @@ internal class StatSvc {
...
@@ -81,7 +81,6 @@ internal class StatSvc {
}
}
}
}
internal
object
Register
:
OutgoingPacketFactory
<
Register
.
Response
>(
"StatSvc.register"
)
{
internal
object
Register
:
OutgoingPacketFactory
<
Register
.
Response
>(
"StatSvc.register"
)
{
internal
object
Response
:
Packet
{
internal
object
Response
:
Packet
{
...
@@ -140,9 +139,10 @@ internal class StatSvc {
...
@@ -140,9 +139,10 @@ internal class StatSvc {
strOSVer
=
client
.
device
.
version
.
release
.
encodeToString
(),
strOSVer
=
client
.
device
.
version
.
release
.
encodeToString
(),
uOldSSOIp
=
0
,
uOldSSOIp
=
0
,
uNewSSOIp
=
MiraiPlatformUtils
.
localIpAddress
().
split
(
"."
).
foldIndexed
(
0L
)
{
index
:
Int
,
acc
:
Long
,
s
:
String
->
uNewSSOIp
=
MiraiPlatformUtils
.
localIpAddress
().
split
(
"."
)
acc
or
((
s
.
toLong
()
shl
(
index
*
16
)))
.
foldIndexed
(
0L
)
{
index
:
Int
,
acc
:
Long
,
s
:
String
->
},
acc
or
((
s
.
toLong
()
shl
(
index
*
16
)))
},
strVendorName
=
"MIUI"
,
strVendorName
=
"MIUI"
,
strVendorOSName
=
"?ONEPLUS A5000_23_17"
,
strVendorOSName
=
"?ONEPLUS A5000_23_17"
,
// register 时还需要
// register 时还需要
...
@@ -178,4 +178,43 @@ internal class StatSvc {
...
@@ -178,4 +178,43 @@ internal class StatSvc {
return
Response
return
Response
}
}
}
}
internal
object
ReqMSFOffline
:
IncomingPacketFactory
<
BotOfflineEvent
.
Dropped
>(
"StatSvc.ReqMSFOffline"
,
"StatSvc.RspMSFForceOffline"
)
{
internal
data class
MsfOfflineToken
(
val
uin
:
Long
,
val
seq
:
Long
,
val
const
:
Byte
)
:
Packet
,
RuntimeException
(
"dropped by StatSvc.ReqMSFOffline"
)
override
suspend
fun
ByteReadPacket
.
decode
(
bot
:
QQAndroidBot
,
sequenceId
:
Int
):
BotOfflineEvent
.
Dropped
{
val
decodeUniPacket
=
decodeUniPacket
(
RequestMSFForceOffline
.
serializer
())
return
BotOfflineEvent
.
Dropped
(
bot
,
MsfOfflineToken
(
decodeUniPacket
.
uin
,
decodeUniPacket
.
iSeqno
,
0
))
}
override
suspend
fun
QQAndroidBot
.
handle
(
packet
:
BotOfflineEvent
.
Dropped
,
sequenceId
:
Int
):
OutgoingPacket
?
{
val
cause
=
packet
.
cause
check
(
cause
is
MsfOfflineToken
)
{
"internal error: handling $packet in StatSvc.ReqMSFOffline"
}
return
buildResponseUniPacket
(
client
)
{
writeJceStruct
(
RequestPacket
.
serializer
(),
RequestPacket
(
sServantName
=
"StatSvc"
,
sFuncName
=
"RspMSFForceOffline"
,
iRequestId
=
0
,
sBuffer
=
jceRequestSBuffer
(
"RspMSFForceOffline"
,
RspMSFForceOffline
.
serializer
(),
RspMSFForceOffline
(
cause
.
uin
,
cause
.
seq
,
cause
.
const
)
)
)
)
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment