Merge branch 'master' into dev

# Conflicts:
#	mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/reverse/client/WsClient.kt

Author: ryoii

README.md

@@ -19,7 +19,7 @@ Mirai 是一个在全平台下运行，提供 QQ Android 和 TIM PC 协议支持
 # mirai-api-http
 Mirai HTTP API (console) plugin
 
-<b>Mirai-API-http插件 提供HTTP API供所有语言使用mirai</b>
+<b>mirai-api-http插件 提供HTTP API供所有语言使用mirai</b>
 
 ## 安装`mirai-api-http`
 
@@ -56,13 +56,13 @@ adapters:
 enableVerify: true
 verifyKey: 1234567890
 
-## 开启一些调式信息
+## 开启一些调试信息
 debug: false
 
 ## 是否开启单 session 模式, 若为 true，则自动创建 session 绑定 console 中登录的 bot
 ## 开启后，接口中任何 sessionKey 不需要传递参数
 ## 若 console 中有多个 bot 登录，则行为未定义
-## 确保 console 中只有一个 bot 登陆时启用
+## 确保 console 中只有一个 bot 登录时启用
 singleMode: false
 
 ## 历史消息的缓存大小

docs/adapter/HttpAdapter.md

@@ -370,7 +370,7 @@ adapterSettings:
 此方法通过 `messageId` 获取历史消息, 历史消息的缓存有容量大小, 在配置文件中设置
 
 ```
-[GET] /messageFromId?sessionKey=YourSessionKey&id=1234567890
+[GET] /messageFromId?sessionKey=YourSessionKey&messageId=1234567890&target=123456789
 ```
 
 **本接口为[GET]请求, 参数格式为url参数**

docs/adapter/ReverseWebsocketAdapter.md

@@ -25,6 +25,8 @@ adapterSettings:
       ## 额外请求头，该连接有效
       extraHeaders:
         q: 1
+      ## 重试连接的间隔（以毫秒计)
+      reconnectInterval: 5000
 
     ## 同上
     - host: localhost2

docs/api/API.md

@@ -147,7 +147,7 @@
 | 名字         | 类型     |  可选  | 举例            | 说明             |
 |------------|--------| ----- | -------------- |----------------|
 | sessionKey | String | true  | YourSessionKey | 你的session key  |
-| id         | Int    | false | 1234567890     | 获取消息的messageId |
+| messageId  | Int    | false | 1234567890     | 获取消息的messageId |
 | target     | Long   | false | 1234567890     | 好友id或群id       |
 
 #### 响应: 

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/MahAdapterFactory.kt

@@ -10,7 +10,7 @@
 package net.mamoe.mirai.api.http.adapter
 
 import net.mamoe.mirai.api.http.adapter.http.HttpAdapter
-import net.mamoe.mirai.api.http.adapter.reverse.ReverseWebsocketAdaptor
+import net.mamoe.mirai.api.http.adapter.reverse.ReverseWebsocketAdapter
 import net.mamoe.mirai.api.http.adapter.webhook.WebhookAdapter
 import net.mamoe.mirai.api.http.adapter.ws.WebsocketAdapter
 import net.mamoe.mirai.utils.MiraiLogger
@@ -31,7 +31,7 @@ object MahAdapterFactory {
          */
         register("http", HttpAdapter::class.java)
         register("ws", WebsocketAdapter::class.java)
-        register("reverse-ws", ReverseWebsocketAdaptor::class.java)
+        register("reverse-ws", ReverseWebsocketAdapter::class.java)
         register("webhook", WebhookAdapter::class.java)
     }
 

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/reverse/ReverseWebsocketAdaptor.kt renamed to mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/reverse/ReverseWebsocketAdapter.kt

@@ -21,7 +21,7 @@ import net.mamoe.mirai.api.http.context.MahContextHolder
 import net.mamoe.mirai.api.http.context.session.Session
 import net.mamoe.mirai.event.events.BotEvent
 
-class ReverseWebsocketAdaptor : MahAdapter("reverse-ws") {
+class ReverseWebsocketAdapter : MahAdapter("reverse-ws") {
 
     private val clients = mutableListOf<WsClient>()
 
@@ -38,7 +38,7 @@ class ReverseWebsocketAdaptor : MahAdapter("reverse-ws") {
 
         // 启动 websocket client 监听 destinations
         setting.destinations.forEach { dest ->
-            val client = WsClient()
+            val client = WsClient(log)
             clients += client
 
             client.listen(dest, setting)

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/reverse/ReverseWebsocketAdapterSetting.kt

@@ -73,4 +73,9 @@ data class Destination(
      * 额外请求头
      */
     val extraHeaders: Map<String, String> = emptyMap(),
+
+    /**
+     * 重试连接的间隔 (按毫秒计)
+     */
+    val reconnectInterval: Long = 5000,
 )

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/reverse/client/WsClient.kt

@@ -15,15 +15,20 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import net.mamoe.mirai.api.http.adapter.reverse.Destination
 import net.mamoe.mirai.api.http.adapter.reverse.ReverseWebsocketAdapterSetting
 import net.mamoe.mirai.api.http.adapter.reverse.handleReverseWs
+import net.mamoe.mirai.utils.MiraiLogger
+import net.mamoe.mirai.utils.warning
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
+import java.net.ConnectException
+import java.net.SocketException
 
-class WsClient : CoroutineScope {
+class WsClient(private var log: MiraiLogger) : CoroutineScope {
 
     override val coroutineContext: CoroutineContext = EmptyCoroutineContext
 
@@ -33,14 +38,24 @@ class WsClient : CoroutineScope {
         install(WebSockets)
     }
 
-    private lateinit var webSocketSession: DefaultClientWebSocketSession
+    private var webSocketSession: DefaultClientWebSocketSession? = null
 
     fun listen(destination: Destination, setting: ReverseWebsocketAdapterSetting) {
         launch {
-            client.ws(buildWsRequest(destination, setting)) {
-                webSocketSession = this
+            while (client.isActive) {
+                try {
+                    client.ws(buildWsRequest(destination, setting)) {
+                        webSocketSession = this
 
-                handleReverseWs(this@WsClient)
+                        handleReverseWs(this@WsClient)
+                    }
+                } catch (_: ConnectException) { // ignored
+                } catch (e: SocketException) { // log
+                    log.error("[reverse-ws] SocketException occurred: ${e.localizedMessage}")
+                }
+                webSocketSession = null
+                log.warning { "[reverse-ws] Connection to ${destination.host + ":" + destination.port + destination.path } interrupted. Trying reconnect in ${destination.reconnectInterval} ms." }
+                delay(destination.reconnectInterval)
             }
         }
     }
@@ -51,7 +66,8 @@ class WsClient : CoroutineScope {
 
     suspend fun send(content: String) {
         if (client.isActive) {
-            webSocketSession.outgoing.send(Frame.Text(content))
+            webSocketSession?.also { it.outgoing.send(Frame.Text(content)) }
+                ?: log.warning { "[reverse-ws] Dropped content $content while waiting for reconnect." }
         }
     }
 

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/spi/persistence/builtinPersistence.kt

@@ -1,6 +1,9 @@
 package net.mamoe.mirai.api.http.spi.persistence
 
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.console.plugin.PluginManager
+import net.mamoe.mirai.console.plugin.dependencies
+import net.mamoe.mirai.console.plugin.jvm.JvmPlugin
 import net.mamoe.mirai.message.data.MessageSource
 import net.mamoe.mirai.message.data.OnlineMessageSource
 import java.util.ServiceLoader
@@ -13,9 +16,22 @@ import java.util.concurrent.ConcurrentLinkedQueue
 class PersistenceManager(private val serviceName: String) {
 
     fun loadFactory(): PersistenceFactory {
-        return ServiceLoader.load(PersistenceFactory::class.java)
-            .firstOrNull { it.getName() == serviceName }
-            ?: BuiltinPersistenceFactory()
+        val oc = Thread.currentThread().contextClassLoader
+        try {
+            for (plugin in PluginManager.plugins) {
+                if (plugin !is JvmPlugin) continue
+                if (plugin.dependencies.none { it.id == "net.mamoe.mirai-api-http" }) continue
+                val classLoader = plugin::class.java.classLoader
+                Thread.currentThread().contextClassLoader = classLoader
+                for (factory in ServiceLoader.load(PersistenceFactory::class.java, classLoader)) {
+                    if (factory.getName() == serviceName) return factory
+                }
+            }
+        } finally {
+            Thread.currentThread().contextClassLoader = oc
+        }
+
+        return BuiltinPersistenceFactory()
     }
 }