Merge pull request #17 from lz1998/master

update mirai

Author: lz1998

.gitignore

@@ -44,4 +44,6 @@ src/main/java/dto/
 .DS_Store
 
 
-device/
+device/
+.wakatime-project
+bots.json

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.11"
+version = "0.0.14"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {
@@ -39,8 +39,8 @@ configurations {
 
 repositories {
     mavenLocal()
-    maven(url = "http://maven.aliyun.com/nexus/content/groups/public/")
-    maven(url = "http://maven.aliyun.com/nexus/content/repositories/jcenter")
+//    maven(url = "http://maven.aliyun.com/nexus/content/groups/public/")
+//    maven(url = "http://maven.aliyun.com/nexus/content/repositories/jcenter")
     mavenCentral()
     jcenter()
 //    maven(url = "http://repo.spring.io/plugins-release")
@@ -50,7 +50,17 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC")
-    implementation("net.mamoe:mirai-core-qqandroid:1.3.2")
+//    api("net.mamoe:mirai-core:2.0-M1-1")
+    val miraiVersion="2.0-RC-dev-9"
+    implementation("net.mamoe", "mirai-core-jvm", miraiVersion) {
+        exclude("net.mamoe", "mirai-core-api")
+        exclude("net.mamoe", "mirai-core-utils")
+    }
+    implementation("net.mamoe", "mirai-core-api-jvm", miraiVersion) {
+        exclude("net.mamoe", "mirai-core-utils")
+    }
+    implementation("net.mamoe", "mirai-core-utils-jvm", miraiVersion)
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm:1.0.1")
     implementation("com.squareup.okhttp3:okhttp:4.8.0")
 //    implementation("com.google.protobuf:protobuf-javalite:3.8.0")
 

onebot_idl

@@ -1,34 +1,37 @@
 package net.lz1998.mirai.entity
 
 import kotlinx.coroutines.*
+import kotlinx.serialization.json.Json
 import net.lz1998.mirai.alias.BFrame
 import net.lz1998.mirai.alias.BFrameType
 import net.lz1998.mirai.ext.*
 import net.lz1998.mirai.service.MyLoginSolver
 import net.lz1998.mirai.utils.*
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.alsoLogin
-import net.mamoe.mirai.event.events.BotEvent
-import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
-import net.mamoe.mirai.event.events.MemberJoinRequestEvent
-import net.mamoe.mirai.event.events.NewFriendRequestEvent
-import net.mamoe.mirai.event.subscribeAlways
-import net.mamoe.mirai.message.MessageEvent
+import net.mamoe.mirai.BotFactory
+import net.mamoe.mirai.event.events.*
 import okhttp3.*
-import okhttp3.internal.ws.WebSocketProtocol
 import okio.ByteString
 import okio.ByteString.Companion.toByteString
-import java.lang.Thread.sleep
+import java.io.File
 import java.util.concurrent.TimeUnit
 
+var json: Json = runCatching {
+    Json {
+        isLenient = true
+        ignoreUnknownKeys = true
+        prettyPrint = true
+    }
+}.getOrElse { Json {} }
+
 class WebsocketBotClient(override var botId: Long, override var password: String, wsUrl: String) : RemoteBot {
     override lateinit var bot: Bot
 
 
     private var lastWsConnectTime: Long = 0
     var connecting: Boolean = false
 
-    private var wsClient: WebSocket? = null
+    var wsClient: WebSocket? = null
     private var httpClient: OkHttpClient = OkHttpClient.Builder()
             .callTimeout(20, TimeUnit.SECONDS)
             .connectTimeout(20, TimeUnit.SECONDS)
@@ -109,28 +112,39 @@ class WebsocketBotClient(override var botId: Long, override var password: String
     }
 
     override suspend fun initBot() {
-        wsClient = httpClient.newWebSocket(wsRequest, wsListener)
-        bot = Bot(botId, password) {
-            fileStrBasedDeviceInfo("device/${botId}.json")
+        val myDeviceInfo = File("device/bot-${botId}.json").loadAsMyDeviceInfo(json)
+        bot = BotFactory.newBot(botId, password) {
+            protocol = myDeviceInfo.protocol
+            deviceInfo = { myDeviceInfo.generateDeviceInfoData() }
             loginSolver = MyLoginSolver
-//            noNetworkLog()
-        }.alsoLogin()
-        bot.subscribeAlways<BotEvent> {
+        }
+        bot.logger.info("DeviceInfo: ${json.encodeToString(MyDeviceInfo.serializer(), myDeviceInfo)}")
+
+        bot.eventChannel.subscribeAlways<BotEvent> {
             onBotEvent(this)
         }
-        bot.subscribeAlways<MessageEvent> {
+        bot.eventChannel.subscribeAlways<net.mamoe.mirai.event.events.MessageEvent> {
             val messageSource = this.source // 撤回消息用
-            bot.messageSourceLru.put(messageSource.id, messageSource)
+            val messageId = if (messageSource.ids.isNotEmpty()) messageSource.ids[0] else 0
+            bot.messageSourceLru.put(messageId, messageSource)
         }
-        bot.subscribeAlways<MemberJoinRequestEvent> {
+        bot.eventChannel.subscribeAlways<MemberJoinRequestEvent> {
             bot.groupRequestLru.put(it.eventId, it)
         }
-        bot.subscribeAlways<BotInvitedJoinGroupRequestEvent> {
+        bot.eventChannel.subscribeAlways<BotInvitedJoinGroupRequestEvent> {
             bot.botInvitedGroupRequestLru.put(it.eventId, it)
         }
-        bot.subscribeAlways<NewFriendRequestEvent> {
+        bot.eventChannel.subscribeAlways<NewFriendRequestEvent> {
             bot.friendRequestLru.put(it.eventId, it)
         }
+        bot.eventChannel.subscribeAlways<BotOnlineEvent> {
+            if (wsClient == null) {
+                wsClient = httpClient.newWebSocket(wsRequest, wsListener)
+            }
+        }
+        GlobalScope.launch {
+            bot.login()
+        }
     }
 
     override suspend fun login() {