Merge pull request #38 from Samarium150/develop

feat: add custom proxy settings; fix #37

Author: Samarium150

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [3.3.0](https://github.com/Samarium150/mirai-console-lolicon/compare/3.2.1...3.3.0) (2021-04-26)
+
+
+### feat
+
+* add custom proxy settings; fix #37 ([a7a6ee5](https://github.com/Samarium150/mirai-console-lolicon/commit/a7a6ee5484f1d01bcbb12d4ecd0fb0bb4ccf3ea5)), closes [#37](https://github.com/Samarium150/mirai-console-lolicon/issues/37)
+
+
+
 ## [3.2.1](https://github.com/Samarium150/mirai-console-lolicon/compare/3.2.0...3.2.1) (2021-04-17)
 
 

build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.6.1"
-    id("org.jetbrains.dokka") version "1.4.0"
+    id("net.mamoe.mirai-console") version "2.6.2"
+    id("org.jetbrains.dokka") version "1.4.32"
 }
 
 group = "com.github.samarium150"
-version = "3.2.1"
+version = "3.3.0"
 
 repositories {
     mavenLocal()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirai-console-lolicon",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "基于mirai-console的涩图机器人",
   "scripts": {
     "changelog": "conventional-changelog -p eslint -i CHANGELOG.md -s"

src/main/kotlin/Main.kt

@@ -37,7 +37,7 @@ import net.mamoe.mirai.console.util.ConsoleExperimentalApi
 object Main: KotlinPlugin(
     JvmPluginDescription(
         id = "com.github.samarium150.mirai-console-lolicon",
-        version = "3.2.1",
+        version = "3.3.0",
         name = "mirai-console-lolicon"
     )
 ) {
@@ -56,6 +56,7 @@ object Main: KotlinPlugin(
         PluginConfig.reload()
         CommandConfig.reload()
         ReplyConfig.reload()
+        ProxyConfig.reload()
         PluginData.reload()
 
         if (PluginConfig.master != 0L) {

src/main/kotlin/ProxyConfig.kt

@@ -0,0 +1,40 @@
+package com.github.samarium150.mirai.plugin
+
+import net.mamoe.mirai.console.data.AutoSavePluginConfig
+import net.mamoe.mirai.console.data.ValueDescription
+import net.mamoe.mirai.console.data.value
+
+/**
+ * Proxy config
+ * <br>
+ * 自定义代理
+ *
+ * @constructor Create empty Proxy config
+ * @see net.mamoe.mirai.console.data.AutoSavePluginConfig
+ */
+object ProxyConfig: AutoSavePluginConfig("ProxyConfig") {
+
+    /**
+     * Type
+     * <br>
+     * 代理类型
+     */
+    @ValueDescription("可选：DIRECT/HTTP/SOCKS")
+    val type: String by value("DIRECT")
+
+    /**
+     * Hostname
+     * <br>
+     * IP地址
+     */
+    @ValueDescription("地址")
+    val hostname: String by value("localhost")
+
+    /**
+     * Port
+     * <br>
+     * 端口
+     */
+    @ValueDescription("端口")
+    val port: Int by value(1080)
+}

src/main/kotlin/RequestHandler.kt

@@ -16,12 +16,15 @@
  */
 package com.github.samarium150.mirai.plugin
 
-import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.core.FuelError
+import com.github.kittinunf.fuel.core.FuelManager
 import com.github.kittinunf.result.Result
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
 import java.io.*
+import java.lang.IllegalArgumentException
+import java.net.InetSocketAddress
+import java.net.Proxy
 
 /**
  * Object for handling GET request
@@ -55,7 +58,17 @@ object RequestHandler {
     @Throws(FuelError::class, JsonSyntaxException::class, APIException::class)
     fun get(parameters: RequestParams): Response {
         val url = "https://api.lolicon.app/setu/?$parameters"
-        val (_, response, result) = Fuel.get(url).responseString()
+        val (_, response, result) = FuelManager()
+            .also {
+                try {
+                    it.proxy = Proxy(
+                        Utils.getProxyType(ProxyConfig.type),
+                        InetSocketAddress(ProxyConfig.hostname, ProxyConfig.port)
+                    )
+                } catch (iae: IllegalArgumentException) { }
+            }
+            .get(url)
+            .responseString()
         if (result is Result.Failure) throw result.getException()
         val feedback: Response = gson.fromJson(String(response.data), Response::class.java)
         if (feedback.code != 0) throw APIException(feedback.code, feedback.msg)
@@ -76,7 +89,15 @@ object RequestHandler {
     fun download(url: String): InputStream {
         if (PluginConfig.save) {
             var file: File? = null
-            val (_, _, result) = Fuel
+            val (_, _, result) = FuelManager()
+                .also {
+                    try {
+                        it.proxy = Proxy(
+                            Utils.getProxyType(ProxyConfig.type),
+                            InetSocketAddress(ProxyConfig.hostname, ProxyConfig.port)
+                        )
+                    } catch (iae: IllegalArgumentException) { }
+                }
                 .download(url)
                 .fileDestination { _, _ ->
                     val urlPaths = url.split("/")
@@ -89,7 +110,15 @@ object RequestHandler {
             return ByteArrayInputStream(file!!.readBytes())
         }
         var outputStream = OutputStream.nullOutputStream()
-        val (_, _, result) = Fuel
+        val (_, _, result) = FuelManager()
+            .also {
+                try {
+                    it.proxy = Proxy(
+                        Utils.getProxyType(ProxyConfig.type),
+                        InetSocketAddress(ProxyConfig.hostname, ProxyConfig.port)
+                    )
+                } catch (iae: IllegalArgumentException) { }
+            }
             .download(url)
             .streamDestination { response: com.github.kittinunf.fuel.core.Response, _ ->
                 outputStream = ByteArrayOutputStream(response.contentLength.toInt())

src/main/kotlin/Utils.kt

@@ -21,6 +21,7 @@ import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.contact.User
 import org.jetbrains.annotations.Nullable
+import java.net.Proxy
 
 /**
  * Object for utility functions
@@ -89,4 +90,24 @@ object Utils {
         }
         return setting
     }
+
+    /**
+     * Get proxy type from the given string
+     * <br>
+     * 根据输入值返回代理类型
+     *
+     * @param value input string value <br> 输入的字符串
+     * @return [Proxy.Type] <br> 代理的类型
+     * @throws IllegalArgumentException if [value] is not [Proxy.Type] <br> 数值非法时抛出
+     * @see Proxy
+     */
+    @Throws(IllegalArgumentException::class)
+    fun getProxyType(value: String): Proxy.Type {
+        return when (value) {
+            "DIRECT" -> Proxy.Type.DIRECT
+            "HTTP" -> Proxy.Type.HTTP
+            "SOCKS" -> Proxy.Type.SOCKS
+            else -> throw IllegalArgumentException(value)
+        }
+    }
 }