diff --git a/src/main/resources/web/js/README b/src/main/resources/web/js/README
new file mode 100644
index 0000000..6b96d79
--- /dev/null
+++ b/src/main/resources/web/js/README
@@ -0,0 +1 @@
+This is code compiled manually by tsc, the sources are in /src/main/typescript
\ No newline at end of file
diff --git a/src/main/resources/web/js/config.js b/src/main/resources/web/js/config.js
index b88c5d5..6fb12b4 100644
--- a/src/main/resources/web/js/config.js
+++ b/src/main/resources/web/js/config.js
@@ -1,7 +1,7 @@
+"use strict";
// See https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-spa-app-registration
// You'll need to add the page as a Redirect URL to Azure as a Single Page Application
// noinspection ES6ConvertVarToLetConst - TODO fix this
-
// Azure Client ID
const azureClientId = "a370fff9-7648-4dbf-b96e-2b4f8d539ac2";
// Origins that we'll not use https://viaversion.github.io/VIAaaS/ as redirect URL
@@ -11,4 +11,5 @@ const whitelistedOrigin = [
// Default CORS Proxy config
var defaultCorsProxy = "https://cors.re.yt.nom.br/";
// Default instance suffix, in format "viaaas.example.com[:25565]", null to use the page hostname;
-var defaultInstanceSuffix = null;
\ No newline at end of file
+var defaultInstanceSuffix = null;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHlwZXNjcmlwdC9qcy9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLG9HQUFvRztBQUNwRyxzRkFBc0Y7QUFDdEYsdURBQXVEO0FBRXZELGtCQUFrQjtBQUNsQixNQUFNLGFBQWEsR0FBVyxzQ0FBc0MsQ0FBQztBQUNyRSxrRkFBa0Y7QUFDbEYsTUFBTSxpQkFBaUIsR0FBYTtJQUNoQywwQkFBMEI7Q0FDN0IsQ0FBQztBQUNGLDRCQUE0QjtBQUM1QixJQUFJLGdCQUFnQixHQUFrQiw0QkFBNEIsQ0FBQztBQUNuRSxrR0FBa0c7QUFDbEcsSUFBSSxxQkFBcUIsR0FBa0IsSUFBSSxDQUFDIn0=
\ 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 0621ec6..ae44b82 100644
--- a/src/main/resources/web/js/page.js
+++ b/src/main/resources/web/js/page.js
@@ -1,4 +1,7 @@
"use strict";
+///
+// Note that some APIs only work on HTTPS
+// Minecraft.id
let urlParams = new URLSearchParams();
window.location.hash.substring(1).split("?")
.map(it => new URLSearchParams(it)
@@ -15,6 +18,7 @@ $(() => {
history.replaceState(null, "", "#");
}
});
+// Page
let connectionStatus = document.getElementById("connection_status");
let corsStatus = document.getElementById("cors_status");
let listening = document.getElementById("listening");
@@ -23,6 +27,7 @@ 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;
+// + deltaTime means that the clock is ahead
let deltaTime = 0;
let workers = [];
$(() => {
@@ -237,7 +242,7 @@ function addToast(title, msg, yes = null, no = null) {
-
+
`);
@@ -295,6 +300,7 @@ function ohNo() {
console.log(e);
}
}
+// Util
function checkFetchSuccess(msg) {
return (r) => {
if (!r.ok)
@@ -314,6 +320,7 @@ function getNetworkTimestamp() {
.then(r => r.json())
.then(it => parseInt(it));
}
+// Notification
let notificationCallbacks = new Map();
$(() => {
new BroadcastChannel("viaaas-notification").addEventListener("message", handleSWMsg);
@@ -332,6 +339,7 @@ function authNotification(msg, yes, no) {
addToast("Allow auth impersonation?", msg, yes, no);
return;
}
+ // @ts-ignore
let tag = uuid.v4();
navigator.serviceWorker.ready.then(r => {
r.showNotification("Click to allow auth impersonation", {
@@ -357,6 +365,7 @@ function authNotification(msg, yes, no) {
}, 30 * 1000);
});
}
+// Cors proxy
function defaultCors() {
return self.defaultCorsProxy || "https://cors.re.yt.nom.br/";
}
@@ -370,12 +379,14 @@ function setCorsProxy(url) {
localStorage.setItem("viaaas_cors_proxy", url);
refreshCorsStatus();
}
+// Account manager
let activeAccounts = [];
function loadAccounts() {
let serialized = localStorage.getItem("viaaas_mc_accounts");
let parsed = serialized ? JSON.parse(serialized) : [];
parsed.forEach((it) => {
if (it.clientToken) {
+ // Mojang auth doesn't work on multiplayer anymore
}
else if (it.msUser && myMSALObj.getAccountByUsername(it.msUser)) {
addActiveAccount(new MicrosoftAccount(it.id, it.name, it.accessToken, it.msUser));
@@ -447,6 +458,7 @@ class MicrosoftAccount extends McAccount {
}
async refresh() {
let msTokenResp = await getTokenPopup(this.msUser, getLoginRequest());
+ // noinspection HttpUrlsUsage
let xboxJson = await fetch("https://user.auth.xboxlive.com/user/authenticate", {
method: "post",
body: JSON.stringify({
@@ -543,6 +555,7 @@ const msalConfig = {
storeAuthStateInCookie: false,
}
};
+// @ts-ignore
const myMSALObj = new msal.PublicClientApplication(msalConfig);
function loginMs() {
let req = getLoginRequest();
@@ -570,6 +583,7 @@ function getTokenPopup(username, request) {
return myMSALObj.acquireTokenSilent(request)
.catch((e) => {
console.warn("silent token acquisition fails.");
+ // @ts-ignore
if (e instanceof msal.InteractionRequiredAuthError) {
return myMSALObj.acquireTokenPopup(request).catch((error) => console.error(error));
}
@@ -578,6 +592,7 @@ function getTokenPopup(username, request) {
}
});
}
+// Websocket
let wsUrl = getWsUrl();
let socket = null;
function defaultWs() {
@@ -593,6 +608,7 @@ function setWsUrl(url) {
localStorage.setItem("viaaas_ws_url", url);
location.reload();
}
+// Tokens
function saveToken(token) {
let serialized = localStorage.getItem("viaaas_tokens");
let hTokens = serialized ? JSON.parse(serialized) : {};
@@ -614,6 +630,7 @@ function getTokens() {
let parsed = serialized ? JSON.parse(serialized) : {};
return parsed[wsUrl] || [];
}
+// Websocket
function listen(token) {
socket === null || socket === void 0 ? void 0 : socket.send(JSON.stringify({ "action": "listen_login_requests", "token": token }));
}
@@ -734,3 +751,4 @@ function sendSocket(msg) {
}
socket.send(msg);
}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../typescript/js/page.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/main/resources/web/js/worker.js b/src/main/resources/web/js/worker.js
index e8642c4..3f26b80 100644
--- a/src/main/resources/web/js/worker.js
+++ b/src/main/resources/web/js/worker.js
@@ -1,48 +1,44 @@
"use strict";
importScripts("https://cdnjs.cloudflare.com/ajax/libs/js-sha512/0.8.0/sha512.min.js");
-
let pending = [];
-
self.addEventListener("message", e => {
- if (e.data.action === "listen_pow") startPoW(e);
- if (e.data.action === "cancel") removePending(e.data.id);
+ if (e.data.action === "listen_pow")
+ startPoW(e);
+ if (e.data.action === "cancel")
+ removePending(e.data.id);
});
-
function removePending(id) {
pending = pending.filter(it => it !== id);
}
-
function startPoW(e) {
pending.push(e.data.id);
listenPoW(e);
}
-
function isPending(id) {
return pending.includes(id);
}
-
function listenPoW(e) {
let user = e.data.user;
let msg = null;
let endTime = Date.now() + 1000;
do {
- if (!isPending(e.data.id)) return; // cancelled
-
+ if (!isPending(e.data.id))
+ return; // cancelled
msg = JSON.stringify({
action: "offline_login",
username: user,
date: Date.now() - e.data.deltaTime,
rand: Math.random()
});
-
if (Date.now() >= endTime) {
setTimeout(() => listenPoW(e));
return;
}
} while (!sha512(msg).startsWith("00000"));
-
setTimeout(() => {
- if (!isPending(e.data.id)) return;
- postMessage({id: e.data.id, action: "completed_pow", msg: msg});
- })
-}
\ No newline at end of file
+ if (!isPending(e.data.id))
+ return;
+ postMessage({ id: e.data.id, action: "completed_pow", msg: msg });
+ });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHlwZXNjcmlwdC9qcy93b3JrZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDO0FBQ2IsYUFBYSxDQUFDLHNFQUFzRSxDQUFDLENBQUM7QUFFdEYsSUFBSSxPQUFPLEdBQUcsRUFBRSxDQUFDO0FBRWpCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLEVBQUU7SUFDakMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxZQUFZO1FBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hELElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssUUFBUTtRQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQzdELENBQUMsQ0FBQyxDQUFDO0FBRUgsU0FBUyxhQUFhLENBQUMsRUFBRTtJQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztBQUM5QyxDQUFDO0FBRUQsU0FBUyxRQUFRLENBQUMsQ0FBQztJQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN4QixTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLEVBQUU7SUFDakIsT0FBTyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ2hDLENBQUM7QUFFRCxTQUFTLFNBQVMsQ0FBQyxDQUFDO0lBQ2hCLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ3ZCLElBQUksR0FBRyxHQUFHLElBQUksQ0FBQztJQUNmLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUM7SUFDaEMsR0FBRztRQUNDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFBRSxPQUFPLENBQUMsWUFBWTtRQUUvQyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUNqQixNQUFNLEVBQUUsZUFBZTtZQUN2QixRQUFRLEVBQUUsSUFBSTtZQUNkLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTO1lBQ25DLElBQUksRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFO1NBQ3RCLENBQUMsQ0FBQztRQUVILElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLE9BQU8sRUFBRTtZQUN2QixVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDL0IsT0FBTztTQUNWO0tBQ0osUUFBUSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUU7SUFFM0MsVUFBVSxDQUFDLEdBQUcsRUFBRTtRQUNaLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFBRSxPQUFPO1FBQ2xDLFdBQVcsQ0FBQyxFQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxNQUFNLEVBQUUsZUFBZSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUMsQ0FBQyxDQUFDO0lBQ3BFLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyJ9
\ No newline at end of file
diff --git a/src/main/typescript/js/config.ts b/src/main/typescript/js/config.ts
new file mode 100644
index 0000000..634733a
--- /dev/null
+++ b/src/main/typescript/js/config.ts
@@ -0,0 +1,14 @@
+// See https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-spa-app-registration
+// You'll need to add the page as a Redirect URL to Azure as a Single Page Application
+// noinspection ES6ConvertVarToLetConst - TODO fix this
+
+// Azure Client ID
+const azureClientId: string = "a370fff9-7648-4dbf-b96e-2b4f8d539ac2";
+// Origins that we'll not use https://viaversion.github.io/VIAaaS/ as redirect URL
+const whitelistedOrigin: string[] = [
+ "https://via.re.yt.nom.br"
+];
+// Default CORS Proxy config
+var defaultCorsProxy: string | null = "https://cors.re.yt.nom.br/";
+// Default instance suffix, in format "viaaas.example.com[:25565]", null to use the page hostname;
+var defaultInstanceSuffix: string | null = null;
\ No newline at end of file
diff --git a/src/main/resources/web/js/page.ts b/src/main/typescript/js/page.ts
similarity index 99%
rename from src/main/resources/web/js/page.ts
rename to src/main/typescript/js/page.ts
index 8db1a2d..7d097da 100644
--- a/src/main/resources/web/js/page.ts
+++ b/src/main/typescript/js/page.ts
@@ -1,4 +1,4 @@
-///
+///
// Note that some APIs only work on HTTPS
// Minecraft.id
@@ -256,7 +256,7 @@ function addToast(title: string, msg: string, yes: (() => void) | null = null, n
-
+
`);
diff --git a/src/main/typescript/js/worker.js b/src/main/typescript/js/worker.js
new file mode 100644
index 0000000..e8642c4
--- /dev/null
+++ b/src/main/typescript/js/worker.js
@@ -0,0 +1,48 @@
+"use strict";
+importScripts("https://cdnjs.cloudflare.com/ajax/libs/js-sha512/0.8.0/sha512.min.js");
+
+let pending = [];
+
+self.addEventListener("message", e => {
+ if (e.data.action === "listen_pow") startPoW(e);
+ if (e.data.action === "cancel") removePending(e.data.id);
+});
+
+function removePending(id) {
+ pending = pending.filter(it => it !== id);
+}
+
+function startPoW(e) {
+ pending.push(e.data.id);
+ listenPoW(e);
+}
+
+function isPending(id) {
+ return pending.includes(id);
+}
+
+function listenPoW(e) {
+ let user = e.data.user;
+ let msg = null;
+ let endTime = Date.now() + 1000;
+ do {
+ if (!isPending(e.data.id)) return; // cancelled
+
+ msg = JSON.stringify({
+ action: "offline_login",
+ username: user,
+ date: Date.now() - e.data.deltaTime,
+ rand: Math.random()
+ });
+
+ if (Date.now() >= endTime) {
+ setTimeout(() => listenPoW(e));
+ return;
+ }
+ } while (!sha512(msg).startsWith("00000"));
+
+ setTimeout(() => {
+ if (!isPending(e.data.id)) return;
+ postMessage({id: e.data.id, action: "completed_pow", msg: msg});
+ })
+}
\ No newline at end of file
diff --git a/src/main/resources/web/tsconfig.json b/tsconfig.json
similarity index 60%
rename from src/main/resources/web/tsconfig.json
rename to tsconfig.json
index 2542498..a64c249 100644
--- a/src/main/resources/web/tsconfig.json
+++ b/tsconfig.json
@@ -11,11 +11,15 @@
"noImplicitOverride": true,
"noImplicitThis": true,
"noImplicitReturns": true,
- "removeComments": true,
+ "removeComments": false,
"alwaysStrict": true,
- "strict": true
+ "strict": true,
+ "allowJs": true,
+ "inlineSourceMap": true,
+ "outDir": "src/main/resources/web/js"
},
"include": [
- "js/**.ts"
+ "src/main/typescript/js/**.ts",
+ "src/main/typescript/js/**.js"
]
}
\ No newline at end of file