Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-01-23 21:52:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

some html, fix coroutine exception handling

Browse Source 
fixes #2055
This commit is contained in:
creeper123123321 2022-06-25 12:08:28 -03:00
parent d9920c01ab
commit 475cc0d1f5
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/com/viaversion/aas/handler/MinecraftHandler.kt
View File

@ -10,7 +10,7 @@ import io.netty.channel.SimpleChannelInboundHandler
import io.netty.handler.proxy.ProxyConnectException
import io.netty.handler.proxy.ProxyHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import java.net.SocketAddress
import java.nio.channels.ClosedChannelException
@ -22,7 +22,7 @@ class MinecraftHandler(
lateinit var endRemoteAddress: SocketAddress
val other: Channel? get() = if (frontEnd) data.backChannel else data.frontChannel
var loggedDc = false
val coroutineScope = CoroutineScope(Job())
val coroutineScope = CoroutineScope(SupervisorJob())
override fun channelRead0(ctx: ChannelHandlerContext, packet: Packet) {
if (!ctx.channel().isActive) return

4
src/main/kotlin/com/viaversion/aas/web/WebServer.kt
View File

@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit
class WebServer {
val clients = ConcurrentHashMap<WebSocketSession, WebClient>()
val jwtAlgorithm = Algorithm.HMAC256(VIAaaSConfig.jwtSecret)
val coroutineScope = CoroutineScope(Job())
val coroutineScope = CoroutineScope(SupervisorJob())
// Minecraft account -> WebClient
val listeners = Multimaps.synchronizedSetMultimap(
@ -136,7 +136,7 @@ class WebServer {
}
}
launch {
delay(20_000)
delay(10_000)
future.completeExceptionally(StacklessException("No response from browser"))
}
}

66
src/main/resources/web/index.html
View File

@ -95,31 +95,43 @@ frame-src 'self' https://login.microsoftonline.com/ https://login.live.com/"
<p>Listening to front-end logins from:</p>
<div id="listening"></div>
<div id="actions">
<button id="listen_continue" type="button" class="btn btn-primary">Listen to <span id="mcIdUsername"></span>
<button type="button" class="btn btn-primary" id="listen_continue">Listen to <span
id="mcIdUsername"></span>
</button>
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#listenModal"
<button type="button" class="btn btn-primary" data-bs-toggle="modal"
data-bs-target="#listenModal"
id="listen_open">Listen to logins
</button>
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#sendTokenModal"
<button type="button" class="btn btn-primary" data-bs-toggle="modal"
data-bs-target="#sendTokenModal"
id="send_token_open">Send Access Token
</button>
</div>
<hr>
<p>Connecting to backend server:</p>
<div id="connect">
<form class="input-group mb-3">
<input id="connect_address" type="text" class="form-control" placeholder="Address:Port"
aria-label="Address and Port">
<input id="connect_version" type="text" class="form-control" placeholder="Version" aria-label="Version">
<select class="form-select" id="connect_online" aria-label="Online Mode">
<option value="null" selected>Front Online Mode...</option>
<option>AUTO</option>
<option value="true">Force online</option>
<option value="false">Force offline (recommended for Geyser)</option>
</select>
<input id="connect_user" type="text" class="form-control" placeholder="Back Username"
aria-label="Backend Username" list="backend_user_list">
<datalist id="backend_user_list"></datalist>
<form class="input-group mb-3 row g-3 justify-content-md-center">
<div class="col-md-auto">
<input id="connect_address" type="text" class="form-control" placeholder="Address:Port"
aria-label="Address and Port" size="20">
</div>
<div class="col-md-auto">
<input id="connect_version" type="text" class="form-control col-auto" placeholder="Version"
aria-label="Version" size="6">
</div>
<div class="col-md-auto">
<select class="form-select" id="connect_online" aria-label="Online Mode" size="1">
<option value="null" selected>Front Online Mode...</option>
<option>AUTO</option>
<option value="true">Force online</option>
<option value="false">Force offline (recommended for Geyser)</option>
</select>
</div>
<div class="col-md-auto">
<input id="connect_user" type="text" class="form-control" placeholder="Back Username"
aria-label="Backend Username" list="backend_user_list" size="16" maxlength="16">
<datalist id="backend_user_list"></datalist>
</div>
</form>
<p>You can also use <a href="https://jo0001.github.io/ViaSetup/aspirin" id="viasetup_address">the address
generator</a> to specify the server</p>
@ -155,20 +167,26 @@ frame-src 'self' https://login.microsoftonline.com/ https://login.live.com/"
<div id="add-account">
<div class="mb-3">
<label class="form-label" for="form_add_ms">Add Microsoft account</label>
<form class="row" id="form_add_ms">
<div class="col-auto">
<form class="row justify-content-md-center" id="form_add_ms">
<div class="col-md-auto">
<button class="btn btn-primary" id="login_submit_ms" type="submit">Login with Microsoft</button>
</div>
</form>
</div>
<div class="mb-2">
<label class="form-label" for="form_add_mc">Add Mojang account</label>
<form class="input-group" id="form_add_mc" action="javascript:">
<input aria-label="Email/Username" class="form-control" id="mc_email"
placeholder="Username" type="text">
<input aria-label="Password" class="form-control" id="mc_password"
placeholder="Password" type="password">
<button class="btn btn-primary" id="login_submit_mc" type="submit">Login with Mojang</button>
<form class="input-group row justify-content-md-center" id="form_add_mc" action="javascript:">
<div class="col-md-auto">
<input aria-label="Email/Username" class="form-control" id="mc_email"
placeholder="Username" type="text">
</div>
<div class="col-md-auto">
<input aria-label="Password" class="form-control" id="mc_password"
placeholder="Password" type="password">
</div>
<div class="col-md-auto">
<button class="btn btn-primary" id="login_submit_mc" type="submit">Login with Mojang</button>
</div>
</form>
</div>
</div>