Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2024-11-04 09:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

show info about cors proxy

Browse Source
This commit is contained in:
creeper123123321 2021-02-09 13:19:07 -03:00
parent 420ae111d7
commit b1e742e2a1
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/resources/web/auth.js
View File

@ -20,6 +20,7 @@ var wsUrl = getWsUrl();
var socket = null;
var connectionStatus = document.getElementById("connection_status");
var corsStatus = document.getElementById("cors_status");
var listening = document.getElementById("listening");
var actions = document.getElementById("actions");
var accounts = document.getElementById("accounts-list");
@ -31,6 +32,34 @@ function getCorsProxy() {
return localStorage.getItem("cors-proxy") || "http://localhost:8080/";
}
function refreshCorsStatus() {
corsStatus.innerText = "...";
icanhazip(true)
.then(ip => {
return icanhazip(false).then(ip2 => {
corsStatus.innerText = "OK " + ip + (ip != ip2 ? " (different IP)" : "");
});
})
.catch(e => {
corsStatus.innerText = "error: " + e;
});
}
function icanhazip(cors) {
return fetch((cors ? getCorsProxy() : "") + "https://icanhazip.com")
.then(it => {
if (!isSuccess(it.status)) throw "not success " + it.status
return it.text();
}).then(it => it.trim());
}
function setCorsProxy(url) {
localStorage.setItem("cors-proxy", url);
refreshCorsStatus();
}
refreshCorsStatus();
function loginMc(user, pass) {
var clientToken = uuid.v4();
fetch(getCorsProxy() + "https://authserver.mojang.com/authenticate", {
@ -43,7 +72,7 @@ function loginMc(user, pass) {
}),
headers: {"content-type": "application/json"}
}).then((data) => {
if (!isSuccess(data.status)) throw "not success code";
if (!isSuccess(data.status)) throw "not success " + data.status;
return data.json();
}).then((data) => {
storeMcAccount(data.accessToken, data.clientToken, data.selectedProfile.name, data.selectedProfile.id);
@ -88,7 +117,7 @@ function logoutMojang(id) {
}),
headers: {"content-type": "application/json"},
}).then((data) => {
if (!isSuccess(data.status)) throw "not success logout";
if (!isSuccess(data.status)) throw "not success logout " + data.status;
removeMcAccount(id);
}).catch((e) => {
if (confirm("failed to invalidate token! error: " + e + " remove account?")) {
@ -178,7 +207,7 @@ function refreshMojangAccount(it) {
}),
headers: {"content-type": "application/json"},
}).then(data => {
if (!isSuccess(data.status)) throw "not success";
if (!isSuccess(data.status)) throw "not success " + data.status;
return data.json();
}).then((json) => {
console.log("refreshed " + json.selectedProfile.id);
@ -284,7 +313,7 @@ function onSocketMsg(event) {
getMcUserToken(account).then((data) => {
return joinGame(data.accessToken, data.id, parsed.session_hash);
}).then((data) => {
if (!isSuccess(data.status)) throw "not success join";
if (!isSuccess(data.status)) throw "not success join " + data.status;
}).finally(() => confirmJoin(parsed.session_hash))
.catch((e) => {
confirmJoin(parsed.session_hash);
@ -334,7 +363,7 @@ function connect() {
$(() => {
$("#cors-proxy").on("change", () => localStorage.setItem("cors-proxy", $("#cors-proxy").val()));
$("#cors-proxy").on("change", () => setCorsProxy($("#cors-proxy").val()));
$("#cors-proxy").val(getCorsProxy());
$("#ws-url").on("change", () => {
localStorage.setItem("ws-url", $("#ws-url").val());

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

@ -55,7 +55,8 @@
</nav>
<div class="container tab-content" id="content">
<div id="home" class="tab-pane fade show active" role="tabpanel" aria-labelledby="home-tab">
<p>WebSocket connection status: <span id="connection_status">?</span></p>
<p>WebSocket connection status: <span id="connection_status" class="text-white bg-dark">?</span></p>
<p>CORS Proxy status: <span id="cors_status" class="text-white bg-dark">?</span></p>
<hr>
<p><span id="actions"></span></p>
<p><span id="listening"></span></p>

4
src/main/resources/web/style.css
View File

@ -1,7 +1,3 @@
.account_head {
width: 16px;
}
#connection_status {
background: black;
color: white;
}