From 1159e16f129882925dc6e938b1e21eae9d831793 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Sat, 21 Jun 2025 21:11:31 +0200 Subject: [PATCH] turn revalidateAuthz into an async function --- static/webui/script.js | 78 ++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/static/webui/script.js b/static/webui/script.js index 44f7ade0..4131d5c7 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -111,11 +111,9 @@ function doLogin() { window.registerSubmit = false; } -function revalidateAuthz(succ_cb) { - getWebSocket().then(() => { - // We have a websocket connection, so authz should be good. - succ_cb(); - }); +async function revalidateAuthz() { + await getWebSocket(); + // We have a websocket connection, so authz should be good. } function logout() { @@ -135,7 +133,7 @@ function doLogout() { function renameAccount() { const newname = window.prompt(loc("code_changeNameConfirm")); if (newname) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { fetch("/custom/renameAccount?" + window.authz + "&newname=" + newname).then(() => { $(".displayname").text(newname); updateLocElements(); @@ -146,7 +144,7 @@ function renameAccount() { function deleteAccount() { if (window.confirm(loc("code_deleteAccountConfirm"))) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { fetch("/custom/deleteAccount?" + window.authz).then(() => { logout(); single.loadRoute("/webui/"); // Show login screen @@ -646,7 +644,7 @@ function updateInventory() { a.href = "#"; a.onclick = function (event) { event.preventDefault(); - revalidateAuthz(() => { + revalidateAuthz().then(() => { const promises = []; if (item.XP < maxXP) { promises.push(addGearExp(category, item.ItemId.$oid, maxXP - item.XP)); @@ -1236,7 +1234,7 @@ function doAcquireEquipment(category) { .focus(); return; } - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.post({ url: "/custom/addItems?" + window.authz, contentType: "application/json", @@ -1363,7 +1361,7 @@ function doAcquireModularEquipment(category, WeaponType) { } }); if (category == "KubrowPets") Parts.unshift(WeaponType); - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.post({ url: "/api/modularWeaponCrafting.php?" + window.authz, contentType: "application/octet-stream", @@ -1416,7 +1414,7 @@ $("input[list]").on("input", function () { }); function dispatchAddItemsRequestsBatch(requests) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.post({ url: "/custom/addItems?" + window.authz, contentType: "application/json", @@ -1460,7 +1458,7 @@ function addMissingEvolutionProgress() { } function maxRankAllEvolutions() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1"); req.done(data => { const requests = []; @@ -1484,7 +1482,7 @@ function maxRankAllEvolutions() { } function maxRankAllEquipment(categories) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1"); req.done(data => { window.itemListPromise.then(itemMap => { @@ -1558,7 +1556,7 @@ function addGearExp(category, oid, xp) { } function sendBatchGearExp(data) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/addXp?" + window.authz, contentType: "application/json", @@ -1571,7 +1569,7 @@ function sendBatchGearExp(data) { } function renameGear(category, oid, name) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { if (category == "KubrowPets") { $.post({ url: "/api/renamePet.php?" + window.authz + "&webui=1", @@ -1599,7 +1597,7 @@ function renameGear(category, oid, name) { function disposeOfGear(category, oid) { if (category == "KubrowPets") { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/releasePet.php?" + window.authz, contentType: "application/octet-stream", @@ -1621,7 +1619,7 @@ function disposeOfGear(category, oid) { Count: 0 } ]; - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/sell.php?" + window.authz, contentType: "text/plain", @@ -1643,7 +1641,7 @@ function disposeOfItems(category, type, count) { Count: count } ]; - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/sell.php?" + window.authz, contentType: "text/plain", @@ -1653,7 +1651,7 @@ function disposeOfItems(category, type, count) { } function gildEquipment(category, oid) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/gildWeapon.php?" + window.authz + "&ItemId=" + oid + "&Category=" + category, contentType: "application/octet-stream", @@ -1667,7 +1665,7 @@ function gildEquipment(category, oid) { } function maturePet(oid, revert) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/maturePet.php?" + window.authz, contentType: "application/octet-stream", @@ -1682,7 +1680,7 @@ function maturePet(oid, revert) { } function setEvolutionProgress(requests) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.post({ url: "/custom/setEvolutionProgress?" + window.authz, contentType: "application/json", @@ -1702,7 +1700,7 @@ function doAcquireMiscItems() { } const count = parseInt($("#miscitem-count").val()); if (count != 0) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/addItems?" + window.authz, contentType: "application/json", @@ -1743,7 +1741,7 @@ function doAcquireRiven() { return; } const uniqueName = "/Lotus/Upgrades/Mods/Randomized/" + $("#addriven-type").val(); - revalidateAuthz(() => { + revalidateAuthz().then(() => { // Add riven type to inventory $.post({ url: "/custom/addItems?" + window.authz, @@ -1790,7 +1788,7 @@ $("#addriven-fingerprint").on("input", () => { }); function setFingerprint(ItemType, ItemId, fingerprint) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/api/artifacts.php?" + window.authz, contentType: "text/plain", @@ -1818,7 +1816,7 @@ function doAcquireMod() { } const count = parseInt($("#mod-count").val()); if (count != 0) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/addItems?" + window.authz, contentType: "application/json", @@ -1895,7 +1893,7 @@ single.getRoute("/webui/cheats").on("beforeload", function () { ); } else { if ((await res.text()) == "Log-in expired") { - revalidateAuthz(() => { + revalidateAuthz().then(() => { if (single.getCurrentPath() == "/webui/cheats") { single.loadRoute("/webui/cheats"); } @@ -1912,7 +1910,7 @@ single.getRoute("/webui/cheats").on("beforeload", function () { }); function doUnlockAllFocusSchools() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1").done(async data => { const missingFocusUpgrades = { "/Lotus/Upgrades/Focus/Attack/AttackFocusAbility": true, @@ -1963,13 +1961,13 @@ function unlockFocusSchool(upgradeType) { } function doHelminthUnlockAll() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post("/api/infestedFoundry.php?" + window.authz + "&mode=custom_unlockall"); }); } function doIntrinsicsUnlockAll() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.get("/custom/unlockAllIntrinsics?" + window.authz); }); } @@ -1981,7 +1979,7 @@ function doAddAllMods() { } modsAll.delete("/Lotus/Upgrades/Mods/Fusers/LegendaryModFuser"); - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1"); req.done(data => { for (const modOwned of data.RawUpgrades) { @@ -2013,7 +2011,7 @@ function doAddAllMods() { } function doRemoveUnrankedMods() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1"); req.done(inventory => { window.itemListPromise.then(itemMap => { @@ -2038,7 +2036,7 @@ function doRemoveUnrankedMods() { } function doAddMissingMaxRankMods() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { fetch("/custom/addMissingMaxRankMods?" + window.authz).then(() => { updateInventory(); }); @@ -2060,7 +2058,7 @@ function doPushArchonCrystalUpgrade() { $("[list='datalist-archonCrystalUpgrades']").addClass("is-invalid").focus(); return; } - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.get( "/custom/pushArchonCrystalUpgrade?" + window.authz + @@ -2078,7 +2076,7 @@ function doPushArchonCrystalUpgrade() { } function doPopArchonCrystalUpgrade(type) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.get( "/custom/popArchonCrystalUpgrade?" + window.authz + @@ -2093,7 +2091,7 @@ function doPopArchonCrystalUpgrade(type) { } function doImport() { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/import?" + window.authz, contentType: "application/json", @@ -2110,7 +2108,7 @@ function doImport() { function doChangeSupportedSyndicate() { const uniqueName = document.getElementById("changeSyndicate").value; - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.get("/api/setSupportedSyndicate.php?" + window.authz + "&syndicate=" + uniqueName).done(function () { updateInventory(); }); @@ -2118,7 +2116,7 @@ function doChangeSupportedSyndicate() { } function doAddCurrency(currency) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/addCurrency?" + window.authz, contentType: "application/json", @@ -2133,7 +2131,7 @@ function doAddCurrency(currency) { } function doQuestUpdate(operation, itemType) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/manageQuests?" + window.authz + "&operation=" + operation + "&itemType=" + itemType, contentType: "application/json" @@ -2144,7 +2142,7 @@ function doQuestUpdate(operation, itemType) { } function doBulkQuestUpdate(operation) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/manageQuests?" + window.authz + "&operation=" + operation, contentType: "application/json" @@ -2242,7 +2240,7 @@ function handleModularSelection(category) { } function setBooster(ItemType, ExpiryDate, callback) { - revalidateAuthz(() => { + revalidateAuthz().then(() => { $.post({ url: "/custom/setBooster?" + window.authz, contentType: "application/json",