-
The instance will cache your Minecraft access token, allowing you to connect without keeping
- this page open.
-
Note that the access token expires in ~1 day and a compromised instance may access your account
- with malicious intents.
+
The instance will cache your Minecraft access token for some minutes, allowing you to connect
+ without keeping this page open.
+
Note that the access token are valid for ~1 day and a compromised instance may be used to access
+ your account.
You'll need to connect as online-mode in the front-end. It's not possible to use the cached
token when changing the backend username
diff --git a/src/main/resources/web/js/config.js b/src/main/resources/web/js/config.js
index 83815a7..df92164 100644
--- a/src/main/resources/web/js/config.js
+++ b/src/main/resources/web/js/config.js
@@ -8,4 +8,6 @@ const whitelistedOrigin = [
"https://via.re.yt.nom.br"
];
// Default CORS Proxy config
-const defaultCorsProxy = "https://cors.re.yt.nom.br/";
\ No newline at end of file
+const defaultCorsProxy = "https://cors.re.yt.nom.br/";
+// Default instance suffix, in format "viaaas.example.com[:25565]", null to use the page hostname;
+const defaultInstanceSuffix = null;
\ No newline at end of file
diff --git a/src/main/resources/web/js/page.js b/src/main/resources/web/js/page.js
index 209d3da..b45f970 100644
--- a/src/main/resources/web/js/page.js
+++ b/src/main/resources/web/js/page.js
@@ -20,6 +20,7 @@ let listening = document.getElementById("listening");
let accounts = document.getElementById("accounts-list");
let cors_proxy_txt = document.getElementById("cors-proxy");
let ws_url_txt = document.getElementById("ws-url");
+let instance_suffix_input = document.getElementById("instance_suffix");
let listenVisible = false;
let deltaTime = 0;
let workers = [];
@@ -39,8 +40,12 @@ $(() => {
$(".async-css").attr("rel", "stylesheet");
$("form").on("submit", e => e.preventDefault());
$("a[href='javascript:']").on("click", e => e.preventDefault());
+ $("[data-bs-toggle='tooltip']").get().forEach(it => {
+ new bootstrap.Tooltip(it);
+ });
cors_proxy_txt.value = getCorsProxy();
ws_url_txt.value = getWsUrl();
+ instance_suffix_input.defaultValue = getDefaultInstanceSuffix();
$("#form_add_ms").on("submit", () => loginMs());
$("#form_ws_url").on("submit", () => setWsUrl($("#ws-url").val()));
$("#form_cors_proxy").on("submit", () => setCorsProxy($("#cors-proxy").val()));
@@ -48,8 +53,11 @@ $(() => {
$("#form_send_token").on("submit", () => submittedSendToken());
$("#en_notifications").on("click", () => Notification.requestPermission().then(renderActions));
$("#listen_continue").on("click", () => clickedListenContinue());
- window.addEventListener('beforeinstallprompt', e => e.preventDefault());
+ $("#address_info_form").on("input", () => generateAddress());
+ $("#generated_address").on("click", () => copyGeneratedAddress());
+ $(window).on("beforeinstallprompt", e => e.preventDefault());
ohNo();
+ generateAddress();
refreshAccountList();
setInterval(refreshCorsStatus, 10 * 60 * 1000);
refreshCorsStatus();
@@ -104,6 +112,39 @@ function refreshAccountList() {
addUsernameList(it.name);
});
}
+function copyGeneratedAddress() {
+ navigator.clipboard.writeText($("#generated_address").text()).catch(e => console.log(e));
+}
+function generateAddress() {
+ let backAddress = $("#connect_address").val();
+ try {
+ let url = new URL("https://" + backAddress);
+ let finalAddress = "";
+ let host = url.hostname;
+ let version = $("#connect_version").val().toString().replaceAll(".", "_");
+ let username = $("#connect_user").val();
+ let onlineMode = $("#connect_online").val().toString();
+ if (host.includes(":") || host.includes("[")) {
+ host = host.replaceAll(":", "-")
+ .replaceAll(/[\[\]]/g, "") + ".sslip.io";
+ }
+ finalAddress += host;
+ if (url.port)
+ finalAddress += "._p" + url.port;
+ if (version)
+ finalAddress += "._v" + version;
+ if (username)
+ finalAddress += "._u" + username;
+ if (onlineMode)
+ finalAddress += "._o" + onlineMode.substring(0, 1);
+ finalAddress += "." + $("#instance_suffix").val();
+ $("#generated_address").text(finalAddress);
+ }
+ catch (e) {
+ console.log(e);
+ $("#generated_address").text("");
+ }
+}
$("#mcIdUsername").text(mcIdUsername);
function submittedListen() {
let user = $("#listen_username").val();
@@ -314,6 +355,9 @@ function authNotification(msg, yes, no) {
function defaultCors() {
return self.defaultCorsProxy || "https://cors.re.yt.nom.br/";
}
+function getDefaultInstanceSuffix() {
+ return self.defaultInstanceSuffix || location.hostname;
+}
function getCorsProxy() {
return localStorage.getItem("viaaas_cors_proxy") || defaultCors();
}
diff --git a/src/main/resources/web/js/page.ts b/src/main/resources/web/js/page.ts
index 1dcf172..308a531 100644
--- a/src/main/resources/web/js/page.ts
+++ b/src/main/resources/web/js/page.ts
@@ -1,5 +1,6 @@
///
"use strict"
+// Note that some APIs only work on HTTPS
// Minecraft.id
let urlParams = new URLSearchParams();
@@ -26,6 +27,7 @@ let listening = document.getElementById("listening");
let accounts = document.getElementById("accounts-list");
let cors_proxy_txt = document.getElementById("cors-proxy") as HTMLInputElement;
let ws_url_txt = document.getElementById("ws-url") as HTMLInputElement;
+let instance_suffix_input = document.getElementById("instance_suffix") as HTMLInputElement;
let listenVisible = false;
// + deltaTime means that the clock is ahead
let deltaTime = 0;
@@ -47,9 +49,13 @@ $(() => {
$(".async-css").attr("rel", "stylesheet");
$("form").on("submit", e => e.preventDefault());
$("a[href='javascript:']").on("click", e => e.preventDefault());
+ $("[data-bs-toggle='tooltip']").get().forEach(it => {
+ new bootstrap.Tooltip(it);
+ });
cors_proxy_txt.value = getCorsProxy();
ws_url_txt.value = getWsUrl();
+ instance_suffix_input.defaultValue = getDefaultInstanceSuffix();
$("#form_add_ms").on("submit", () => loginMs());
$("#form_ws_url").on("submit", () => setWsUrl($("#ws-url").val() as string));
@@ -58,10 +64,13 @@ $(() => {
$("#form_send_token").on("submit", () => submittedSendToken());
$("#en_notifications").on("click", () => Notification.requestPermission().then(renderActions));
$("#listen_continue").on("click", () => clickedListenContinue());
- window.addEventListener('beforeinstallprompt', e => e.preventDefault());
+ $("#address_info_form").on("input", () => generateAddress());
+ $("#generated_address").on("click", () => copyGeneratedAddress());
+ $(window).on("beforeinstallprompt", e => e.preventDefault());
ohNo();
+ generateAddress();
refreshAccountList();
setInterval(refreshCorsStatus, 10 * 60 * 1000);
refreshCorsStatus();
@@ -125,6 +134,36 @@ function refreshAccountList() {
});
}
+function copyGeneratedAddress() {
+ navigator.clipboard.writeText($("#generated_address").text()).catch(e => console.log(e));
+}
+
+function generateAddress() {
+ let backAddress = $("#connect_address").val();
+ try {
+ let url = new URL("https://" + backAddress);
+ let finalAddress = "";
+ let host = url.hostname;
+ let version = $("#connect_version").val().toString().replaceAll(".", "_");
+ let username = $("#connect_user").val();
+ let onlineMode = $("#connect_online").val().toString();
+ if (host.includes(":") || host.includes("[")) {
+ host = host.replaceAll(":", "-")
+ .replaceAll(/[\[\]]/g, "") + ".sslip.io";
+ }
+ finalAddress += host;
+ if (url.port) finalAddress += "._p" + url.port;
+ if (version) finalAddress += "._v" + version;
+ if (username) finalAddress += "._u" + username;
+ if (onlineMode) finalAddress += "._o" + onlineMode.substring(0, 1);
+ finalAddress += "." + $("#instance_suffix").val();
+ $("#generated_address").text(finalAddress)
+ } catch (e) {
+ console.log(e);
+ $("#generated_address").text("");
+ }
+}
+
$("#mcIdUsername").text(mcIdUsername);
function submittedListen() {
@@ -354,6 +393,11 @@ function defaultCors(): string {
return self.defaultCorsProxy || "https://cors.re.yt.nom.br/";
}
+function getDefaultInstanceSuffix(): string {
+ // @ts-ignore
+ return self.defaultInstanceSuffix || location.hostname;
+}
+
function getCorsProxy(): string {
return localStorage.getItem("viaaas_cors_proxy") || defaultCors();
}
diff --git a/src/main/resources/web/tsconfig.json b/src/main/resources/web/tsconfig.json
index d866106..d6e7f9a 100644
--- a/src/main/resources/web/tsconfig.json
+++ b/src/main/resources/web/tsconfig.json
@@ -3,7 +3,7 @@
"target": "ES2018",
"module": "ES2015",
"lib": [
- "ES2018",
+ "ES2021",
"DOM"
],
"moduleResolution": "Node",