Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2024-06-26 10:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

query ipinfo.io for notification msg

Browse Source
This commit is contained in:
creeper123123321 2021-03-21 19:50:44 -03:00
parent 3fca13cfef
commit 5d82128688
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@ -76,6 +76,7 @@ dependencies {
implementation("io.ktor:ktor-server-host-common:$ktorVersion")
implementation("io.ktor:ktor-websockets:$ktorVersion")
testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
implementation("io.ipinfo:ipinfo-api:1.0")
}
val run: JavaExec by tasks

8
src/main/kotlin/com/github/creeper123123321/viaaas/web/WebClient.kt
View File

@ -1,6 +1,7 @@
package com.github.creeper123123321.viaaas.web
import com.github.creeper123123321.viaaas.config.VIAaaSConfig
import com.github.creeper123123321.viaaas.viaWebServer
import com.google.common.collect.Sets
import com.google.common.util.concurrent.RateLimiter
import io.ktor.features.*
@ -24,16 +25,13 @@ data class WebClient(
fun listenId(uuid: UUID): Boolean {
if (listenedIds.size >= VIAaaSConfig.listeningWsLimit) return false // This is getting insane
server.listeners.computeIfAbsent(uuid) { Sets.newConcurrentHashSet() }.add(this)
server.listeners.put(uuid, this)
listenedIds.add(uuid)
return true
}
fun unlistenId(uuid: UUID) {
server.listeners[uuid]?.remove(this)
if (server.listeners[uuid]?.isEmpty() == true) {
server.listeners.remove(uuid)
}
server.listeners.remove(uuid, this)
listenedIds.remove(uuid)
}
}

18
src/main/kotlin/com/github/creeper123123321/viaaas/web/WebDashboardServer.kt
View File

@ -2,10 +2,11 @@ package com.github.creeper123123321.viaaas.web
import com.github.creeper123123321.viaaas.httpClient
import com.github.creeper123123321.viaaas.parseUndashedId
import com.github.creeper123123321.viaaas.viaWebServer
import com.github.creeper123123321.viaaas.webLogger
import com.google.common.cache.CacheBuilder
import com.google.common.cache.CacheLoader
import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.Multimaps
import com.google.gson.JsonObject
import io.ktor.client.request.*
import io.ktor.features.*
@ -22,8 +23,11 @@ import java.util.concurrent.CompletableFuture
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
import io.ipinfo.api.IPInfo
class WebDashboardServer {
// I don't think i'll need more than 1k/day
val ipInfo = IPInfo.builder().setToken("").build()
val clients = ConcurrentHashMap<WebSocketSession, WebClient>()
val loginTokens = CacheBuilder.newBuilder()
.expireAfterAccess(10, TimeUnit.DAYS)
@ -34,7 +38,7 @@ class WebDashboardServer {
}
// Minecraft account -> WebClient
val listeners = ConcurrentHashMap<UUID, MutableSet<WebClient>>()
val listeners = Multimaps.synchronizedListMultimap(ArrayListMultimap.create<UUID, WebClient>())
val usernameIdCache = CacheBuilder.newBuilder()
.expireAfterWrite(1, TimeUnit.HOURS)
.build<String, UUID>(CacheLoader.from { name ->
@ -55,16 +59,22 @@ class WebDashboardServer {
address: SocketAddress, backAddress: SocketAddress
): CompletableFuture<Unit> {
val future = pendingSessionHashes.get(hash)
if (listeners[id]?.isEmpty() != false) {
if (!listeners.containsKey(id)) {
future.completeExceptionally(IllegalStateException("No browser listening"))
} else {
val info = try {
if (address is InetSocketAddress) {
ipInfo.lookupIP(address.address.hostAddress.substringBefore("%"))
} else null
} catch (ignored: Exception) { null }
val msg = "Client: $address (${info?.asn?.name}, ${info?.city}, ${info?.region}, ${info?.countryCode})\nBackend: $backAddress"
listeners[id]?.forEach {
it.ws.send(
JsonObject().also {
it.addProperty("action", "session_hash_request")
it.addProperty("user", name)
it.addProperty("session_hash", hash)
it.addProperty("message", "Client is $address, backend is $backAddress")
it.addProperty("message", msg)
}.toString()
)
it.ws.flush()