Skip to content

Commit

Permalink
refactor: more async operations in cape API
Browse files Browse the repository at this point in the history
  • Loading branch information
@opZywl
opZywl committed Dec 30, 2024
1 parent 8f8421a commit 6ac0ad9
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 159 deletions.
19 changes: 9 additions & 10 deletions src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,18 +252,20 @@ object FDPClient {

// Login into known token if not empty
if (CapeService.knownToken.isNotBlank()) {
runCatching {
CapeService.login(CapeService.knownToken)
}.onFailure {
LOGGER.error("Failed to login into known cape token.", it)
}.onSuccess {
LOGGER.info("Successfully logged in into known cape token.")
SharedScopes.IO.launch {
runCatching {
CapeService.login(CapeService.knownToken)
}.onFailure {
LOGGER.error("Failed to login into known cape token.", it)
}.onSuccess {
LOGGER.info("Successfully logged in into known cape token.")
}
}
}

// Refresh cape service
CapeService.refreshCapeCarriers {
LOGGER.info("Successfully loaded ${CapeService.capeCarriers.size} cape carriers.")
LOGGER.info("Successfully loaded ${it.size} cape carriers.")
}

// Load background
Expand Down Expand Up @@ -291,9 +293,6 @@ object FDPClient {

// Save all available configs
saveAllConfigs()

// Shutdown discord rpc
discordRPC.stop()
}

}
172 changes: 75 additions & 97 deletions src/main/java/net/ccbluex/liquidbounce/handler/cape/CapeService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,21 @@
*/
package net.ccbluex.liquidbounce.handler.cape

import com.google.gson.JsonParser
import kotlinx.coroutines.*
import net.ccbluex.liquidbounce.event.Listenable
import net.ccbluex.liquidbounce.event.SessionUpdateEvent
import net.ccbluex.liquidbounce.event.handler
import net.ccbluex.liquidbounce.utils.client.ClientUtils.LOGGER
import net.ccbluex.liquidbounce.utils.client.MinecraftInstance
import net.ccbluex.liquidbounce.utils.io.HttpUtils
import net.ccbluex.liquidbounce.utils.kotlin.SharedScopes
import net.ccbluex.liquidbounce.utils.login.UserUtils
import net.ccbluex.liquidbounce.utils.io.HttpUtils.get
import org.apache.http.HttpHeaders
import org.apache.http.HttpStatus
import org.apache.http.client.methods.HttpDelete
import org.apache.http.client.methods.HttpGet
import org.apache.http.client.methods.HttpPatch
import org.apache.http.client.methods.HttpPut
import org.apache.http.entity.StringEntity
import org.apache.http.impl.client.HttpClients
import org.apache.http.message.BasicHeader
import org.apache.http.util.EntityUtils
import org.json.JSONObject
import net.ccbluex.liquidbounce.utils.io.decodeJson
import net.ccbluex.liquidbounce.utils.io.parseJson
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import java.util.*
import java.util.concurrent.atomic.AtomicLong

Expand All @@ -46,7 +40,9 @@ object CapeService : Listenable, MinecraftInstance {
var knownToken = ""
get() = clientCapeUser?.token ?: field

@Volatile
var clientCapeUser: CapeSelfUser? = null
private set

/**
* I would prefer to use CLIENT_API but due to Cloudflare causing issues with SSL and their browser integrity check,
Expand All @@ -62,24 +58,26 @@ object CapeService : Listenable, MinecraftInstance {

private const val SELF_CAPE_URL = "$CAPE_API/self"

@Deprecated("Use CAPE_CARRIERS_URL instead.")
private const val CAPE_UUID_DL_BASE_URL = "$CAPE_API/uuid/%s"
private const val CAPE_NAME_DL_BASE_URL = "$CAPE_API/name/%s"
private const val REFRESH_DELAY = 300000L // Every 5 minutes should update

/**
* Collection of all cape carriers on the API.
* We start with an empty list, which will be updated by the refreshCapeCarriers function frequently based on the REFRESH_DELAY.
* A CapeCarrier is a pair of (uuid, cape_name)
*/
internal var capeCarriers = emptyList<CapeCarrier>()
@Volatile
private var capeCarriers = emptyMap<UUID, String>()
private val lastUpdate = AtomicLong(0L)
private var refreshJob: Job? = null

private val client = HttpUtils.httpClient

/**
* Refresh cape carriers, capture from the API.
* It will take a list of (uuid, cape_name) tuples.
*/
fun refreshCapeCarriers(force: Boolean = false, done: () -> Unit) {
fun refreshCapeCarriers(force: Boolean = false, done: (capeCarriers: Map<UUID, String>) -> Unit) {
val currentTime = System.currentTimeMillis()
if (currentTime - lastUpdate.get() > REFRESH_DELAY || force) {
if (refreshJob?.isActive != true) {
Expand All @@ -89,32 +87,28 @@ object CapeService : Listenable, MinecraftInstance {
val (json, code) = get(CAPE_CARRIERS_URL)
if (code != 200) throw RuntimeException("Failed to get cape carriers. Status code: $code")

val parsedJson = JsonParser().parse(json)

// Should be a JSON Array. It will fail if not.
// Format: [["8f617b6abea04af58e4bd026d8fa9de8", "marco"], ...]
val jsonCapeCarriers = parsedJson.asJsonArray.map { objInArray ->
// Format: [["8f617b6a-bea0-4af5-8e4b-d026d8fa9de8", "marco"], ...]
capeCarriers = json.parseJson().asJsonArray.associate { objInArray ->
// Should be a JSON Array. It will fail if not.
val arrayInArray = objInArray.asJsonArray
// 1. is UUID 2. is name of cape
val (uuid, name) = arrayInArray[0].asString to arrayInArray[1].asString
val uuid = arrayInArray[0].asString
val name = arrayInArray[1].asString

val dashedUuid = Regex("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)")
.replace(uuid, "$1-$2-$3-$4-$5")
CapeCarrier(UUID.fromString(dashedUuid), name)
UUID.fromString(uuid) to name
}

capeCarriers = jsonCapeCarriers
lastUpdate.set(currentTime)
done()
done(capeCarriers)
}.onFailure {
LOGGER.error("Failed to refresh cape carriers due to error.", it)
}
}
}
} else {
// Call out done immediate because there is no refresh required at the moment
done()
done(capeCarriers)
}
}

Expand All @@ -131,39 +125,27 @@ object CapeService : Listenable, MinecraftInstance {
}

// Lookup cape carrier by UUID, if UUID is matching
val capeCarrier = capeCarriers.find { it.uuid == uuid } ?: return null
val capeName = capeCarriers[uuid] ?: return null

return capeCarrier.capeName to String.format(CAPE_NAME_DL_BASE_URL, capeCarrier.capeName)
return capeName to String.format(CAPE_NAME_DL_BASE_URL, capeName)
}

fun login(token: String) {
val httpClient = HttpClients.createDefault()
val headers = arrayOf(
BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
BasicHeader(HttpHeaders.AUTHORIZATION, token)
)

SharedScopes.IO.launch {
runCatching {
val request = HttpGet(SELF_CAPE_URL)
request.setHeaders(headers)

val response = httpClient.execute(request)
val statusCode = response.statusLine.statusCode
suspend fun login(token: String) = withContext(Dispatchers.IO) {
val request = Request.Builder()
.url(SELF_CAPE_URL)
.addHeader("Content-Type", "application/json")
.addHeader("Authorization", token)
.build()

if (statusCode == HttpStatus.SC_OK) {
val json = JSONObject(EntityUtils.toString(response.entity))
val capeName = json.getString("cape")
val enabled = json.getBoolean("enabled")
val uuid = json.getString("uuid")
client.newCall(request).execute().use { response ->
if (response.isSuccessful) {
val json = response.body?.charStream()?.decodeJson<LoginResponse>()
?: throw RuntimeException("Failed to decode JSON of self cape. Response: ${response.body?.string()}")

clientCapeUser = CapeSelfUser(token, enabled, uuid, capeName)
LOGGER.info("Logged in successfully. Cape: $capeName")
} else {
throw RuntimeException("Failed to get self cape. Status code: $statusCode")
}
}.onFailure {
LOGGER.error("Failed to login due to error.", it)
clientCapeUser = CapeSelfUser(token, json.enabled, json.uuid, json.cape)
LOGGER.info("Logged in successfully. Cape: ${json.cape}")
} else {
throw RuntimeException("Failed to get self cape. Status code: ${response.code}")
}
}
}
Expand All @@ -177,86 +159,82 @@ object CapeService : Listenable, MinecraftInstance {
/**
* Update the cape state of the user
*/
fun toggleCapeState(done: (Boolean, Boolean, Int) -> Unit) {
fun toggleCapeState(done: (enabled: Boolean, success: Boolean, statusCode: Int) -> Unit) {
val capeUser = clientCapeUser ?: return

SharedScopes.IO.launch {
runCatching {
val httpClient = HttpClients.createDefault()
val headers = arrayOf(
BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
BasicHeader(HttpHeaders.AUTHORIZATION, capeUser.token)
)

val request = if (!capeUser.enabled) {
HttpPut(SELF_CAPE_URL)
} else {
HttpDelete(SELF_CAPE_URL)
val request = Request.Builder()
.url(SELF_CAPE_URL)
.apply {
if (capeUser.enabled) delete()
else put("".toRequestBody(null))
}
.addHeader("Content-Type", "application/json")
.addHeader("Authorization", capeUser.token)
.build()

try {
val statusCode = client.newCall(request).execute().use { response ->
response.code
}
request.setHeaders(headers)
val response = httpClient.execute(request)
val statusCode = response.statusLine.statusCode

// Refresh cape carriers
refreshCapeCarriers(force = true) {
LOGGER.info("Cape state toggled successfully.")
}

capeUser.enabled = !capeUser.enabled
done(capeUser.enabled, statusCode == HttpStatus.SC_NO_CONTENT, statusCode)
}.onFailure {
LOGGER.error("Failed to toggle cape state due to error.", it)

done(capeUser.enabled, statusCode == 204, statusCode) // HTTP 204 No Content
} catch (e: Throwable) {
LOGGER.error("Failed to toggle cape state due to error.", e)
}
}
}

/**
* We want to immediately update the owner of the cape and refresh the cape carriers
*/
val onNewSession = handler<SessionUpdateEvent>(dispatcher = Dispatchers.IO) {
private val onNewSession = handler<SessionUpdateEvent>(dispatcher = Dispatchers.IO) {
// Check if donator cape is actually enabled and has a transfer code, also make sure the account used is premium.
val capeUser = clientCapeUser ?: return@handler

if (!UserUtils.isValidTokenOffline(mc.session.token))
return@handler

runCatching {
try {
// Apply cape to new account
val uuid = mc.session.playerID
val username = mc.session.username

val httpClient = HttpClients.createDefault()
val headers = arrayOf(
BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
BasicHeader(HttpHeaders.AUTHORIZATION, capeUser.token)
)
val request = HttpPatch(SELF_CAPE_URL)
request.setHeaders(headers)
val requestBody = "{\"uuid\":${uuid}}".toRequestBody("application/json".toMediaType())

val body = JSONObject()
body.put("uuid", uuid)
request.entity = StringEntity(body.toString())
val request = Request.Builder()
.url(SELF_CAPE_URL)
.patch(requestBody)
.addHeader("Content-Type", "application/json")
.addHeader("Authorization", capeUser.token)
.build()

val response = httpClient.execute(request)
val statusCode = response.statusLine.statusCode

if (statusCode == HttpStatus.SC_NO_CONTENT) {
capeUser.uuid = uuid
LOGGER.info("[Donator Cape] Successfully transferred cape to $uuid ($username)")
} else {
LOGGER.info("[Donator Cape] Failed to transfer cape ($statusCode)")
client.newCall(request).execute().use { response ->
if (response.code == 204) { // HTTP 204 No Content
capeUser.uuid = uuid
LOGGER.info("[Donator Cape] Successfully transferred cape to $uuid ($username)")
} else {
LOGGER.info("[Donator Cape] Failed to transfer cape (${response.code})")
}
}

// Refresh cape carriers
refreshCapeCarriers(force = true) {
LOGGER.info("Cape carriers refreshed after session change.")
}
}.onFailure {
LOGGER.error("Failed to handle new session due to error.", it)
} catch (e: Throwable) {
LOGGER.error("Failed to handle new session due to error.", e)
}
}
}

data class CapeSelfUser(val token: String, var enabled: Boolean, var uuid: String, val capeName: String)
private data class LoginResponse(val cape: String, val enabled: Boolean, val uuid: String)

data class CapeCarrier(val uuid: UUID, val capeName: String)
data class CapeSelfUser(val token: String, var enabled: Boolean, var uuid: String, val capeName: String)
15 changes: 13 additions & 2 deletions src/main/java/net/ccbluex/liquidbounce/handler/discord/DiscordRPC.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,33 @@
*/
package net.ccbluex.liquidbounce.handler.discord

import com.google.gson.JsonObject
import com.jagrosh.discordipc.IPCClient
import com.jagrosh.discordipc.IPCListener
import com.jagrosh.discordipc.entities.RichPresence
import com.jagrosh.discordipc.entities.pipe.PipeStatus
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import net.ccbluex.liquidbounce.FDPClient.CLIENT_CLOUD
import net.ccbluex.liquidbounce.FDPClient.CLIENT_VERSION
import net.ccbluex.liquidbounce.event.ClientShutdownEvent
import net.ccbluex.liquidbounce.event.Listenable
import net.ccbluex.liquidbounce.event.handler
import net.ccbluex.liquidbounce.features.module.ModuleManager
import net.ccbluex.liquidbounce.features.module.modules.client.DiscordRPCModule
import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.discordApp
import net.ccbluex.liquidbounce.utils.io.HttpUtils.get
import net.ccbluex.liquidbounce.utils.client.ClientUtils.LOGGER
import net.ccbluex.liquidbounce.utils.client.MinecraftInstance
import net.ccbluex.liquidbounce.utils.client.ServerUtils
import net.ccbluex.liquidbounce.utils.client.ServerUtils.formatSessionTime
import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.discordApp
import net.ccbluex.liquidbounce.utils.io.parseJson
import net.ccbluex.liquidbounce.utils.kotlin.SharedScopes

import org.json.JSONObject
import java.time.OffsetDateTime

object DiscordRPC : MinecraftInstance {
object DiscordRPC : MinecraftInstance, Listenable {

// IPC Client
private var ipcClient: IPCClient? = null
Expand Down Expand Up @@ -159,6 +166,10 @@ object DiscordRPC : MinecraftInstance {
}
}

private val onClientShutdown = handler<ClientShutdownEvent> {
stop()
}

private fun loadConfiguration() {
appID = discordApp.toLong()
assets["rpc"] = "rpc"
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/net/ccbluex/liquidbounce/utils/io/GsonExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ inline fun jsonArray(builderAction: JsonArrayBuilder.() -> Unit): JsonArray {
return JsonArrayBuilder().apply(builderAction).build()
}

inline fun <reified T> JsonElement.decode(gson: Gson = PRETTY_GSON): T = gson.fromJson<T>(this, object : TypeToken<T>() {}.type)
inline fun <reified T> JsonElement.decode(gson: Gson = PRETTY_GSON): T = gson.fromJson(this, object : TypeToken<T>() {}.type)

inline fun <reified T> Reader.decodeJson(gson: Gson = PRETTY_GSON): T = gson.fromJson<T>(this, object : TypeToken<T>() {}.type)
inline fun <reified T> String.decodeJson(gson: Gson = PRETTY_GSON): T = gson.fromJson<T>(this, object : TypeToken<T>() {}.type)
inline fun <reified T> Reader.decodeJson(gson: Gson = PRETTY_GSON): T = gson.fromJson(this, object : TypeToken<T>() {}.type)

inline fun <reified T> String.decodeJson(gson: Gson = PRETTY_GSON): T = gson.fromJson(this, object : TypeToken<T>() {}.type)
Loading

0 comments on commit 6ac0ad9

Please sign in to comment.