52d7a3cd2b
* cmd/anubis: drastically optimize proof of work Closes #12 Closes #17 This drastically optimizes the proof of work check by removing the stringify call at every iteration. Additionally, this optimizes the checks by running them in parallel for as many threads as the browser has available (according to navigator.hardwareConcurrency). This also changes the redirect lag to 250 milliseconds instead of 2000 milliseconds in order to be perceptually faster. This is below the reaction time threshold of many people, so this will make the post-check success phase perceptually instant. Testing on an iPhone 7 Plus has shown that this can clear a difficulty 4 check in 3.4 seconds. This actually optimizes the check so much it may be a logistical concern for operators. * cmd/anubis/js: fix happy cachebuster logic Signed-off-by: Xe Iaso <me@xeiaso.net> --------- Signed-off-by: Xe Iaso <me@xeiaso.net>
73 lines
No EOL
2.3 KiB
JavaScript
73 lines
No EOL
2.3 KiB
JavaScript
import { process } from './proof-of-work.mjs';
|
|
import { testVideo } from './video.mjs';
|
|
|
|
// from Xeact
|
|
const u = (url = "", params = {}) => {
|
|
let result = new URL(url, window.location.href);
|
|
Object.entries(params).forEach((kv) => {
|
|
let [k, v] = kv;
|
|
result.searchParams.set(k, v);
|
|
});
|
|
return result.toString();
|
|
};
|
|
|
|
const imageURL = (mood, cacheBuster) =>
|
|
u(`/.within.website/x/cmd/anubis/static/img/${mood}.webp`, { cacheBuster });
|
|
|
|
(async () => {
|
|
const status = document.getElementById('status');
|
|
const image = document.getElementById('image');
|
|
const title = document.getElementById('title');
|
|
const spinner = document.getElementById('spinner');
|
|
const anubisVersion = JSON.parse(document.getElementById('anubis_version').textContent);
|
|
|
|
// const testarea = document.getElementById('testarea');
|
|
|
|
// const videoWorks = await testVideo(testarea);
|
|
// console.log(`videoWorks: ${videoWorks}`);
|
|
|
|
// if (!videoWorks) {
|
|
// title.innerHTML = "Oh no!";
|
|
// status.innerHTML = "Checks failed. Please check your browser's settings and try again.";
|
|
// image.src = imageURL("sad");
|
|
// spinner.innerHTML = "";
|
|
// spinner.style.display = "none";
|
|
// return;
|
|
// }
|
|
|
|
status.innerHTML = 'Calculating...';
|
|
|
|
const { challenge, difficulty } = await fetch("/.within.website/x/cmd/anubis/api/make-challenge", { method: "POST" })
|
|
.then(r => {
|
|
if (!r.ok) {
|
|
throw new Error("Failed to fetch config");
|
|
}
|
|
return r.json();
|
|
})
|
|
.catch(err => {
|
|
title.innerHTML = "Oh no!";
|
|
status.innerHTML = `Failed to fetch config: ${err.message}`;
|
|
image.src = imageURL("sad");
|
|
spinner.innerHTML = "";
|
|
spinner.style.display = "none";
|
|
throw err;
|
|
});
|
|
|
|
status.innerHTML = `Calculating...<br/>Difficulty: ${difficulty}`;
|
|
|
|
const t0 = Date.now();
|
|
const { hash, nonce } = await process(challenge, difficulty);
|
|
const t1 = Date.now();
|
|
console.log({ hash, nonce });
|
|
|
|
title.innerHTML = "Success!";
|
|
status.innerHTML = `Done! Took ${t1 - t0}ms, ${nonce} iterations`;
|
|
image.src = imageURL("happy", anubisVersion);
|
|
spinner.innerHTML = "";
|
|
spinner.style.display = "none";
|
|
|
|
setTimeout(() => {
|
|
const redir = window.location.href;
|
|
window.location.href = u("/.within.website/x/cmd/anubis/api/pass-challenge", { response: hash, nonce, redir, elapsedTime: t1 - t0 });
|
|
}, 250);
|
|
})(); |