Commit 04022a2d authored by Him188's avatar Him188

Move PacketDebugger.kt from mirai-debug to mirai-core:jvmTest

parent e47143e8
@file:Suppress("EXPERIMENTAL_API_USAGE", "MemberVisibilityCanBePrivate", "EXPERIMENTAL_UNSIGNED_LITERALS") @file:Suppress("EXPERIMENTAL_API_USAGE", "MemberVisibilityCanBePrivate", "EXPERIMENTAL_UNSIGNED_LITERALS")
import PacketDebugger.dataSent package mirai.test.packetdebugger
import PacketDebugger.qq
import PacketDebugger.sessionKey import mirai.test.packetdebugger.PacketDebugger.dataSent
import mirai.test.packetdebugger.PacketDebugger.qq
import mirai.test.packetdebugger.PacketDebugger.sessionKey
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.io.core.* import kotlinx.io.core.*
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
...@@ -10,7 +12,6 @@ import net.mamoe.mirai.network.BotNetworkHandler ...@@ -10,7 +12,6 @@ import net.mamoe.mirai.network.BotNetworkHandler
import net.mamoe.mirai.network.BotSession import net.mamoe.mirai.network.BotSession
import net.mamoe.mirai.network.protocol.tim.TIMProtocol import net.mamoe.mirai.network.protocol.tim.TIMProtocol
import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter
import net.mamoe.mirai.network.protocol.tim.handler.TemporaryPacketHandler
import net.mamoe.mirai.network.protocol.tim.packet.* import net.mamoe.mirai.network.protocol.tim.packet.*
import net.mamoe.mirai.network.protocol.tim.packet.event.IgnoredEventPacket import net.mamoe.mirai.network.protocol.tim.packet.event.IgnoredEventPacket
import net.mamoe.mirai.network.protocol.tim.packet.login.CaptchaKey import net.mamoe.mirai.network.protocol.tim.packet.login.CaptchaKey
...@@ -18,7 +19,6 @@ import net.mamoe.mirai.network.protocol.tim.packet.login.LoginResult ...@@ -18,7 +19,6 @@ import net.mamoe.mirai.network.protocol.tim.packet.login.LoginResult
import net.mamoe.mirai.network.protocol.tim.packet.login.ShareKey import net.mamoe.mirai.network.protocol.tim.packet.login.ShareKey
import net.mamoe.mirai.network.protocol.tim.packet.login.TouchKey import net.mamoe.mirai.network.protocol.tim.packet.login.TouchKey
import net.mamoe.mirai.utils.DecryptionFailedException import net.mamoe.mirai.utils.DecryptionFailedException
import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.decryptBy import net.mamoe.mirai.utils.decryptBy
import net.mamoe.mirai.utils.io.* import net.mamoe.mirai.utils.io.*
import org.pcap4j.core.BpfProgram.BpfCompileMode import org.pcap4j.core.BpfProgram.BpfCompileMode
...@@ -104,7 +104,7 @@ fun main() { ...@@ -104,7 +104,7 @@ fun main() {
* *
* @author Him188moe * @author Him188moe
*/ */
object PacketDebugger { internal object PacketDebugger {
/** /**
* 会话密匙, 用于解密数据. * 会话密匙, 用于解密数据.
* 在一次登录中会话密匙不会改变. * 在一次登录中会话密匙不会改变.
...@@ -181,12 +181,6 @@ object PacketDebugger { ...@@ -181,12 +181,6 @@ object PacketDebugger {
} }
} }
internal fun ByteReadPacket.debugPrint(name: String = "", length: Long = this.remaining): ByteReadPacket {
val bytes = this.readBytes(length.toInt())
println("$name=" + bytes.toUHexString())
return bytes.toReadPacket()
}
/** /**
* 提供解密密匙. 无需修改 * 提供解密密匙. 无需修改
*/ */
...@@ -314,10 +308,6 @@ internal object DebugNetworkHandler : BotNetworkHandler<DataPacketSocketAdapter> ...@@ -314,10 +308,6 @@ internal object DebugNetworkHandler : BotNetworkHandler<DataPacketSocketAdapter>
override val isOpen: Boolean override val isOpen: Boolean
get() = true get() = true
override suspend fun sendPacket(packet: OutgoingPacket) {
}
override fun close() { override fun close() {
} }
...@@ -326,17 +316,13 @@ internal object DebugNetworkHandler : BotNetworkHandler<DataPacketSocketAdapter> ...@@ -326,17 +316,13 @@ internal object DebugNetworkHandler : BotNetworkHandler<DataPacketSocketAdapter>
} }
override val bot: Bot = Bot(qq, "", coroutineContext) override val bot: Bot = Bot(qq, "", coroutineContext)
override val session = BotSession(bot, sessionKey, socket, this) override val session = BotSession(
bot, sessionKey,
socket, this
)
override suspend fun login(): LoginResult = LoginResult.SUCCESS override suspend fun login(): LoginResult = LoginResult.SUCCESS
@UseExperimental(MiraiInternalAPI::class)
override suspend fun addHandler(temporaryPacketHandler: TemporaryPacketHandler<*, *>) {
}
override suspend fun sendPacket(packet: OutgoingPacket) {
}
override suspend fun awaitDisconnection() { override suspend fun awaitDisconnection() {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment