switch to not using bullshit

Author: Lythium4848

build.gradle.kts

@@ -17,7 +17,7 @@ group = "dev.lythium.pulsar"
 version = "0.0.1"
 
 application {
-    mainClass.set("io.ktor.server.netty.EngineMain")
+	mainClass.set("dev.lythium.pulsar.ApplicationKt")
 }
 
 repositories {
@@ -35,8 +35,7 @@ dependencies {
 	implementation("io.ktor:ktor-server-content-negotiation-jvm:$ktorVersion")
 	implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:$ktorVersion")
 
-	implementation("io.ktor:ktor-client-core:$ktorVersion")
-	implementation("io.ktor:ktor-client-jetty:$ktorVersion")
+	implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
 	implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
 	implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
@@ -48,3 +47,8 @@ dependencies {
 	implementation("io.github.cdimascio:dotenv-kotlin:$dotenvVersion")
 }
 
+ktor {
+	fatJar {
+		archiveFileName.set("pulsar-backend-prod.jar")
+	}
+}

gradle.properties

@@ -1,4 +1,4 @@
-ktorVersion=2.3.8
+ktorVersion=3.0.0-beta-1
 kotlinVersion=1.9.22
 logbackVersion=1.4.14
 kotlin.code.style=official

src/main/kotlin/dev/lythium/pulsar/Addons.kt

@@ -1,13 +1,10 @@
 package dev.lythium.pulsar
 
-import io.ktor.client.*
-import io.ktor.client.engine.jetty.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
 import io.ktor.http.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.eclipse.jetty.util.ssl.SslContextFactory
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import java.util.*
 
 @Serializable
@@ -36,34 +33,24 @@ data class PurchaseData(
 object Addons {
 	private var addons: Array<Addon>? = null
 
-	suspend fun get(): Array<Addon>? {
+	fun get(): Array<Addon>? {
 		if (this.addons?.isEmpty() == true || this.addons == null) {
-			val httpClient = HttpClient(Jetty) {
-				engine {
-					sslContextFactory = SslContextFactory.Client()
-					clientCacheSize = 12
-				}
-			}
+			val client = OkHttpClient.Builder()
+				.build()
 
-			val response: HttpResponse =
-				httpClient.request("https://www.gmodstore.com/api/v3/teams/${Environment.dotenv.get("GMS_TEAM_ID")}/products") {
-					method = HttpMethod.Get
-					headers {
-						append(HttpHeaders.Authorization, "Bearer " + Environment.dotenv.get("GMS_API_KEY"))
-					}
-					parameters {
-						append("perPage", "100")
-					}
-				}
+			val request = Request.Builder()
+				.url("https://www.gmodstore.com/api/v3/teams/${Environment.dotenv.get("GMS_TEAM_ID")}/products")
+				.addHeader(HttpHeaders.Authorization, "Bearer " + Environment.dotenv.get("GMS_API_KEY"))
+				.build()
 
-			val responseBody = response.bodyAsText()
+			val response = client.newCall(request).execute()
+
+			val responseBody = response.body?.string()
 
 			val json = Json { ignoreUnknownKeys = true }
-			val addonResponse = json.decodeFromString<AddonResponse>(responseBody)
+			val addonResponse = json.decodeFromString<AddonResponse>(responseBody!!)
 
 			this.addons = addonResponse.data.map { Addon(it.id, it.name) }.toTypedArray()
-
-			httpClient.close()
 		}
 
 		return this.addons

src/main/kotlin/dev/lythium/pulsar/Application.kt

@@ -1,5 +1,6 @@
 package dev.lythium.pulsar
 
+import dev.lythium.pulsar.Tickets.addon
 import dev.lythium.pulsar.routes.ticketRoutes
 import dev.lythium.pulsar.routes.userRoutes
 import io.github.cdimascio.dotenv.dotenv
@@ -35,30 +36,32 @@ suspend fun main(args: Array<String>) {
 	val username = Environment.dotenv.get("DATABASE_USERNAME")
 	val password = Environment.dotenv.get("DATABASE_PASSWORD")
 
-	if (connectionString == null) {
+	connectionString ?: run {
 		println("DATABASE_URL NOT SET!")
 		exitProcess(1)
 	}
-	if (username == null) {
+
+	username ?: run {
 		println("DATABASE_USERNAME NOT SET!")
 		exitProcess(1)
 	}
-	if (password == null) {
+
+	password ?: run {
 		println("DATABASE_PASSWORD NOT SET!")
 		exitProcess(1)
 	}
 
-	if (Environment.dotenv.get("API_KEY") == null) {
+	Environment.dotenv.get("API_KEY") ?: run {
 		println("API_KEY NOT SET!")
 		exitProcess(1)
 	}
 
-	if (Environment.dotenv.get("GMS_API_KEY") == null) {
+	Environment.dotenv.get("GMS_API_KEY") ?: run {
 		println("GMS_API_KEY NOT SET!")
 		exitProcess(1)
 	}
 
-	if (Environment.dotenv.get("GMS_TEAM_ID") == null) {
+	Environment.dotenv.get("GMS_TEAM_ID") ?: run {
 		println("GMS_TEAM_ID NOT SET!")
 		exitProcess(1)
 	}
@@ -121,12 +124,8 @@ fun Application.module() {
 			call.respond(addons!!)
 		}
 		get("/addons/{id}") {
-			val id = call.parameters["id"]?.toString()
-
-			if (id == null) {
-				call.respond(HttpStatusCode.BadRequest, "Invalid addon parameter.")
-				return@get
-			}
+			val id =
+				call.parameters["id"] ?: return@get call.respond(HttpStatusCode.BadRequest, "Invalid addon parameter.")
 
 			val addonId: UUID?
 			try {
@@ -136,13 +135,11 @@ fun Application.module() {
 				return@get
 			}
 
-			val addon = Addons.getAddon(addonId)
-			if (addon != null) {
-				call.respond(HttpStatusCode.OK, addon)
-			} else {
-				call.respond(HttpStatusCode.NotFound, "Addon not found.")
-			}
+			val addon = Addons.getAddon(addonId) ?: return@get call.respond(HttpStatusCode.NotFound, "Addon not found.")
+
+			call.respond(HttpStatusCode.OK, addon)
 		}
+
 		get("*") {
 			call.respondText("404 Not Found", status = HttpStatusCode.NotFound)
 		}

src/main/kotlin/dev/lythium/pulsar/User.kt

@@ -1,9 +1,5 @@
 package dev.lythium.pulsar
 
-import io.ktor.client.*
-import io.ktor.client.engine.jetty.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
 import io.ktor.http.*
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -12,7 +8,8 @@ import kotlinx.serialization.Serializer
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.Json
-import org.eclipse.jetty.util.ssl.SslContextFactory
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.jetbrains.exposed.dao.id.UUIDTable
 import java.util.*
 
@@ -36,33 +33,22 @@ class User(
 	val discordId: Long
 ) {
 	suspend fun getOwnedAddons(): Array<Addon?> {
-		val httpClient = HttpClient(Jetty) {
-			engine {
-				sslContextFactory = SslContextFactory.Client()
-				clientCacheSize = 12
-			}
-		}
+		val client = OkHttpClient.Builder()
+			.build()
 
 		val productIdFilter = Addons.get()?.joinToString(",") { it.id.toString() }
 
-		val response: HttpResponse =
-			httpClient.request("https://www.gmodstore.com/api/v3/users/${this.gmodstoreId}/purchases") {
-				method = HttpMethod.Get
-				headers {
-					append(HttpHeaders.Authorization, "Bearer " + Environment.dotenv.get("GMS_API_KEY"))
-				}
-				url {
-					parameters.append("perPage", "100")
-					parameters.append("filter[revoked]", "false")
-					parameters.append("filter[productId]", "$productIdFilter")
-				}
-			}
+		val request = Request.Builder()
+			.url("https://www.gmodstore.com/api/v3/users/${this.gmodstoreId}/purchases?perPage=100&filter[revoked]=false&filter[productId]=$productIdFilter")
+			.addHeader(HttpHeaders.Authorization, "Bearer " + Environment.dotenv.get("GMS_API_KEY"))
+			.build()
 
-		httpClient.close()
+		val response = client.newCall(request).execute()
+
+		val responseBody = response.body?.string()
 
-		val responseBody = response.bodyAsText()
 		val json = Json { ignoreUnknownKeys = true }
-		val addonResponse = json.decodeFromString<PurchaseResponse>(responseBody)
+		val addonResponse = json.decodeFromString<PurchaseResponse>(responseBody!!)
 
 		val ownedAddons = addonResponse.data.map {
 			Addons.getAddon(it.productId)

src/main/resources/application.conf

@@ -2,6 +2,9 @@ ktor {
 development = true
     deployment {
         port = 8080
+        port = ${?PORT}
+        sslPort = 8443
+        sslPort = ${?SSL_PORT}
         watch = [ classes, resources ]
     }
 
@@ -10,4 +13,13 @@ development = true
             dev.lythium.pulsar.ApplicationKt.module
         ]
     }
+
+    security {
+            ssl {
+                keyStore = test.jks
+                keyAlias = testkey
+                keyStorePassword = Password
+                privateKeyPassword = Password
+            }
+        }
 }