[cleanup] Removed bloat http request lib (kami-blue#1899)

jmarchive · Feb 1, 2021 · edef039 · edef039
1 parent ce4ee05
commit edef039
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -122,8 +122,6 @@ dependencies {
         exclude module: 'jna'
     }
 
-    jarLibs('com.squareup.okhttp3:okhttp:4.9.0')
-
     // Kotlin libs
     // kotlin-stdlib-common and annotations aren't required at runtime
     jarLibs("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version") {

diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java
@@ -9,7 +9,6 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import okhttp3.OkHttpClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -44,8 +43,6 @@ public class KamiMod {
     @Mod.Instance
     public static KamiMod INSTANCE;
 
-    private static final OkHttpClient httpClient = new OkHttpClient();
-
     private static boolean ready = false;
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
@@ -83,8 +80,4 @@ public static boolean isReady() {
         return ready;
     }
 
-    public static OkHttpClient getHttpClient() {
-        return httpClient;
-    }
-
 }
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt
@@ -1,5 +1,6 @@
 package me.zeroeightsix.kami.module.modules.chat
 
+import com.google.gson.JsonObject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import me.zeroeightsix.kami.KamiMod
@@ -15,9 +16,8 @@ import me.zeroeightsix.kami.util.threads.defaultScope
 import me.zeroeightsix.kami.util.threads.safeListener
 import net.minecraft.network.play.server.SPacketChat
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
+import org.apache.commons.io.IOUtils
+import org.kamiblue.commons.utils.ConnectionUtils
 import org.kamiblue.event.listener.listener
 
 internal object DiscordNotifs : Module(
@@ -45,9 +45,10 @@ internal object DiscordNotifs : Module(
 
     /* Listeners to send the messages */
     init {
-        listener<PacketEvent.Receive> {
-            if (mc.player == null || it.packet !is SPacketChat) return@listener
+        safeListener<PacketEvent.Receive> {
+            if (it.packet !is SPacketChat) return@safeListener
             val message = it.packet.chatComponent.unformattedText
+
             if (timeout(message) && shouldSend(message)) {
                 sendMessage(getPingID(message) + getMessageType(message, server) + getTime() + message)
             }
@@ -115,23 +116,39 @@ internal object DiscordNotifs : Module(
         else ChatTimestamp.time
 
     private fun sendMessage(content: String) {
-        val jsonType = "application/json; charset=utf-8".toMediaType()
-
-        // todo json dsl
-        val body = "{\"username\": \"$username\", \"content\": \"$content\", \"avatar_url\": \"${avatar.value}\"}".toRequestBody(jsonType)
-        val request: Request = Request.Builder()
-            .url(url.value)
-            .addHeader("Content-Type", "application/json")
-            .post(body)
-            .build()
-
         defaultScope.launch(Dispatchers.IO) {
-            // todo probably make some DSL for this lol
-            KamiMod.getHttpClient().newCall(request).execute().use { response ->
-                val responseBody = response.body?.string().toString()
-                if (responseBody.isBlank()) return@launch // Returns 204 empty normally. We want to warn log any non-empty responses.
-                KamiMod.LOG.warn("DiscordNotifs OkHttp Request\n${responseBody}")
-            }
+            ConnectionUtils.runConnection(
+                url.value,
+                { connection ->
+                    val bytes = JsonObject().run {
+                        addProperty("username", username)
+                        addProperty("content", content)
+                        addProperty("avatar_url", avatar.value)
+                        toString().toByteArray(Charsets.UTF_8)
+                    }
+
+                    connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8")
+                    connection.setRequestProperty("Accept", "application/json")
+                    connection.setRequestProperty("User-Agent", "")
+
+                    connection.requestMethod = "POST"
+                    connection.outputStream.use {
+                        it.write(bytes)
+                    }
+
+                    val response = connection.inputStream.use {
+                        IOUtils.toString(it, Charsets.UTF_8)
+                    }
+
+                    if (response.isNotEmpty()) {
+                        KamiMod.LOG.info("Unexpected response from DiscordNotifs http request: $response")
+                    }
+                },
+                {
+                    KamiMod.LOG.warn("Error while sending webhook", it)
+                },
+            )
         }
     }
+
 }