update

Author: lz1998

src/main/kotlin/net/lz1998/mirai/controller/BotController.kt

@@ -15,14 +15,11 @@ class BotController {
     @Autowired
     lateinit var botService: BotService
 
-    @Autowired
-    lateinit var myLoginSolver: MyLoginSolver
-
 
     // 创建一个机器人并登陆
     @RequestMapping("/create/v1", produces = ["application/x-protobuf"], consumes = ["application/x-protobuf"])
     fun createBot(@RequestBody param: HttpDto.CreateBotReq): HttpDto.CreateBotResp {
-        botService.createBot(param.botId, param.password)
+        GlobalScope.launch { botService.createBot(param.botId, param.password) }
         return HttpDto.CreateBotResp.newBuilder().build()
     }
 

src/main/kotlin/net/lz1998/mirai/entity/RemoteBot.kt

@@ -1,20 +1,15 @@
 package net.lz1998.mirai.entity
 
-import net.lz1998.mirai.ext.messageSourceLru
-import net.lz1998.mirai.service.myLoginSolver
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.alsoLogin
 import net.mamoe.mirai.event.events.BotEvent
-import net.mamoe.mirai.event.subscribeAlways
-import net.mamoe.mirai.message.MessageEvent
 import onebot.OnebotFrame
 
 interface RemoteBot {
     var bot: Bot
     var botId: Long
     var password: String
 
-    fun initBot()
+    suspend fun initBot()
 
     suspend fun login()
 

src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt

@@ -5,10 +5,11 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.lz1998.mirai.ext.messageSourceLru
-import net.lz1998.mirai.service.myLoginSolver
+import net.lz1998.mirai.service.MyLoginSolver
 import net.lz1998.mirai.utils.*
 import net.lz1998.mirai.utils.toFrame
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.alsoLogin
 import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.event.subscribeAlways
 import net.mamoe.mirai.message.MessageEvent
@@ -88,13 +89,13 @@ class WebsocketBotClient(override var botId: Long, override var password: String
     }
 
 
-    override fun initBot() {
+    override suspend fun initBot() {
         wsClient = httpClient.newWebSocket(wsRequest, wsListener)
         bot = Bot(botId, password) {
             fileBasedDeviceInfo("device.json")
-            loginSolver = myLoginSolver
+            loginSolver = MyLoginSolver
             noNetworkLog()
-        }
+        }.alsoLogin()
         bot.subscribeAlways<BotEvent> {
             onBotEvent(this)
         }

src/main/kotlin/net/lz1998/mirai/service/BotService.kt

@@ -10,12 +10,12 @@ class BotService {
     val botMap = mutableMapOf<Long, RemoteBot>()
 
     @Synchronized
-    fun createBot(botId: Long, password: String) {
+    suspend fun createBot(botId: Long, password: String) {
         var bot = botMap[botId]
         if (bot == null) {
             bot = WebsocketBotClient(botId, password, "ws://127.0.0.1:8081/ws/cq/")
-            bot.initBot()
             botMap[botId] = bot
+            bot.initBot()
         }
     }
 

src/main/kotlin/net/lz1998/mirai/service/MyLoginSolver.kt

@@ -9,7 +9,7 @@ import okio.ByteString.Companion.toByteString
 import org.springframework.stereotype.Service
 
 @Service
-class MyLoginSolver : LoginSolver() {
+object MyLoginSolver : LoginSolver() {
     // TODO 通过轮询查询 loginMap
     val loginMap = mutableMapOf<Long, LoginData>()
 
@@ -34,12 +34,14 @@ class MyLoginSolver : LoginSolver() {
         val def = CompletableDeferred<String>()
         val loginData = LoginData(bot.id, LoginDataType.UNSAFE_DEVICE_LOGIN_VERIFY, def, null, url)
         loginMap[bot.id] = loginData
+        println(loginMap.toString())
         return def.await().trim()
     }
 
     fun solveLogin(botId: Long, result: String) {
         val loginData = loginMap[botId] ?: return
         loginData.def.complete(result)
+        loginMap.remove(botId)
     }
 
     fun getCaptchaList(): Collection<HttpDto.Captcha> {
@@ -79,4 +81,4 @@ enum class LoginDataType(val type: String) {
     UNSAFE_DEVICE_LOGIN_VERIFY("unsafe_device_login_verify"),
 }
 
-val myLoginSolver = MyLoginSolver()
+//val myLoginSolver = MyLoginSolver()