refactor: switch to ktor

README.md

@@ -22,7 +22,7 @@ Add the dependency to your `build.gradle.kts`:
 
 ```kotlin
 dependencies {
-    implementation("dev.kdriver:proxy:0.1.0")
+    implementation("dev.kdriver:proxy:0.2.0")
 }
 ```
 

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "dev.kdriver"
-    version = "0.1.0"
+    version = "0.2.0"
 
     repositories {
         mavenCentral()

proxy/build.gradle.kts

@@ -35,16 +35,44 @@ mavenPublishing {
 }
 
 kotlin {
-    // jvm
+    // Tiers are in accordance with <https://kotlinlang.org/docs/native-target-support.html>
+    // Tier 1
+    macosX64()
+    macosArm64()
+    iosSimulatorArm64()
+    iosX64()
+
+    // Tier 2
+    linuxX64()
+    linuxArm64()
+    watchosSimulatorArm64()
+    watchosX64()
+    watchosArm32()
+    watchosArm64()
+    tvosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    iosArm64()
+
+    // Tier 3
+    mingwX64()
+    watchosDeviceArm64()
+
+    // jvm & js
     jvmToolchain(21)
     jvm {
-        withJava()
         testRuns.named("test") {
             executionTask.configure {
                 useJUnitPlatform()
             }
         }
     }
+    js {
+        generateTypeScriptDefinitions()
+        binaries.library()
+        nodejs()
+        browser()
+    }
 
     applyDefaultHierarchyTemplate()
     sourceSets {
@@ -56,7 +84,9 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(libs.kaccelero.core)
-                api(libs.slf4j)
+                api(libs.ktor.http)
+                api(libs.ktor.network)
+                api(libs.ktor.network.tls)
             }
         }
         val jvmTest by getting {

proxy/src/commonMain/kotlin/dev/kdriver/proxy/LocalProxyController.kt

@@ -1,17 +1,17 @@
 package dev.kdriver.proxy
 
+import io.ktor.util.collections.*
+import io.ktor.util.logging.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import org.slf4j.LoggerFactory
-import java.util.concurrent.ConcurrentHashMap
 
 internal object LocalProxyController {
 
-    private val logger = LoggerFactory.getLogger("LocalProxyController")
+    private val logger = KtorSimpleLogger("LocalProxyController")
 
-    private val proxies = ConcurrentHashMap<Int, Socks5ProxyServer>()
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val proxies = ConcurrentMap<Int, Socks5ProxyServer>()
+    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
 
     fun startProxy(port: Int, proxy: Proxy) {
         if (proxies.containsKey(port)) {

proxy/src/commonMain/kotlin/dev/kdriver/proxy/Proxy.kt

@@ -1,9 +1,42 @@
 package dev.kdriver.proxy
 
-import java.net.URI
+import io.ktor.http.*
 
+/**
+ * Represents a network proxy configuration
+ */
 data class Proxy(
-    val url: URI,
+    /**
+     * The proxy URL
+     */
+    val url: Url,
+    /**
+     * Optional username for proxy authentication
+     */
     val username: String? = null,
+    /**
+     * Optional password for proxy authentication
+     */
     val password: String? = null,
-)
+) {
+
+    /**
+     * Create a Proxy from a URL string
+     *
+     * @param url The proxy URL string
+     * @param username Optional username for proxy authentication
+     * @param password Optional password for proxy authentication
+     *
+     * @return A Proxy instance
+     */
+    constructor(
+        url: String,
+        username: String? = null,
+        password: String? = null,
+    ) : this(
+        Url(url),
+        username,
+        password
+    )
+
+}