♻️ Make plugin connector fully suspendable

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / freenet / plugin / FredPluginConnector.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt
index 45afb36..98849c4 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt
@@ -16,7 +16,7 @@ import javax.inject.*
  */
 class FredPluginConnector @Inject constructor(private val pluginRespiratorFacade: PluginRespiratorFacade) : PluginConnector {
 
-       override fun sendRequest(pluginName: String, fields: SimpleFieldSet, data: Bucket?): PluginReply {
+       override suspend fun sendRequest(pluginName: String, fields: SimpleFieldSet, data: Bucket?): PluginReply {
                val receivedReply = Channel<PluginReply>()
                val responseReceiver = FredPluginTalker { _, _, responseFields, responseData ->
                        GlobalScope.launch {
@@ -26,9 +26,7 @@ class FredPluginConnector @Inject constructor(private val pluginRespiratorFacade
                try {
                        val pluginTalker = pluginRespiratorFacade.getPluginTalker(responseReceiver, pluginName, "")
                        pluginTalker.send(fields, data)
-                       return runBlocking {
-                               receivedReply.receive()
-                       }
+                       return receivedReply.receive()
                } catch (e: PluginNotFoundException) {
                        throw PluginException(cause = e)
                }