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
a157a106
Commit
a157a106
authored
Oct 03, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Login to LoginHandler
parent
71a1a409
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
...mMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
+2
-3
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
.../mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
+6
-6
No files found.
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
View file @
a157a106
package
net.mamoe.mirai.network
import
kotlinx.coroutines.CompletableDeferred
import
net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.BotSocket
import
net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.Login
import
net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.Login
Handler
import
net.mamoe.mirai.network.protocol.tim.handler.ActionPacketHandler
import
net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocket
import
net.mamoe.mirai.network.protocol.tim.handler.MessagePacketHandler
...
...
@@ -23,7 +22,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.login.LoginState
*
* 其中, [PacketHandler] 由 4 个子模块构成:
* - [DebugPacketHandler] 输出 [Packet.toString]
* - [Login] 处理 touch/login/verification code 相关
* - [Login
Handler
] 处理 touch/login/verification code 相关
* - [MessagePacketHandler] 处理消息相关(群消息/好友消息)([ServerEventPacket])
* - [ActionPacketHandler] 处理动作相关(踢人/加入群/好友列表等)
*
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
View file @
a157a106
...
...
@@ -31,7 +31,7 @@ import javax.imageio.ImageIO
internal
class
TIMBotNetworkHandler
(
private
val
bot
:
Bot
)
:
BotNetworkHandler
{
override
val
socket
:
BotSocket
=
BotSocket
()
lateinit
var
login
:
Login
lateinit
var
login
Handler
:
LoginHandler
override
lateinit
var
message
:
MessagePacketHandler
override
lateinit
var
action
:
ActionPacketHandler
...
...
@@ -123,7 +123,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
withContext
(
NetworkScope
.
coroutineContext
)
{
launch
{
login
.
onPacketReceived
(
packet
)
login
Handler
.
onPacketReceived
(
packet
)
}
...
...
@@ -177,9 +177,9 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
fun
touch
(
serverAddress
:
String
,
timeoutMillis
:
Long
):
CompletableDeferred
<
LoginState
>
{
bot
.
info
(
"Connecting server: $serverAddress"
)
if
(
this
@TIMBotNetworkHandler
::
login
.
isInitialized
)
{
login
.
close
()
login
Handler
.
close
()
}
login
=
Login
()
login
Handler
=
LoginHandler
()
this
.
loginResult
=
CompletableDeferred
()
serverIP
=
serverAddress
...
...
@@ -243,7 +243,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
/**
* 处理登录过程
*/
inner
class
Login
{
inner
class
Login
Handler
{
private
lateinit
var
token00BA
:
ByteArray
private
lateinit
var
token0825
:
ByteArray
//56
private
var
loginTime
:
Int
=
0
...
...
@@ -370,7 +370,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
socket
.
loginResult
!!
.
complete
(
LoginState
.
SUCCESS
)
login
.
changeOnlineStatus
(
ClientLoginStatus
.
ONLINE
)
login
Handler
.
changeOnlineStatus
(
ClientLoginStatus
.
ONLINE
)
}
is
ServerLoginSuccessPacket
->
{
...
...
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