feat(webui): world state toggles

src/controllers/custom/configController.ts

@@ -0,0 +1,42 @@
+import { RequestHandler } from "express";
+import { config } from "@/src/services/configService";
+import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
+import { saveConfig } from "@/src/services/configWatcherService";
+
+export const getConfigController: RequestHandler = async (req, res) => {
+    const account = await getAccountForRequest(req);
+    if (isAdministrator(account)) {
+        const responseData: Record<string, boolean | string | number | null> = {};
+        for (const id of req.body as string[]) {
+            const [obj, idx] = configIdToIndexable(id);
+            responseData[id] = obj[idx] ?? null;
+        }
+        res.json(responseData);
+    } else {
+        res.status(401).end();
+    }
+};
+
+export const setConfigController: RequestHandler = async (req, res) => {
+    const account = await getAccountForRequest(req);
+    if (isAdministrator(account)) {
+        for (const [id, value] of Object.entries(req.body as Record<string, boolean | string | number>)) {
+            const [obj, idx] = configIdToIndexable(id);
+            obj[idx] = value;
+        }
+        await saveConfig();
+        res.end();
+    } else {
+        res.status(401).end();
+    }
+};
+
+const configIdToIndexable = (id: string): [Record<string, boolean | string | number | undefined>, string] => {
+    let obj = config as unknown as Record<string, never>;
+    const arr = id.split(".");
+    while (arr.length > 1) {
+        obj = obj[arr[0]];
+        arr.splice(0, 1);
+    }
+    return [obj, arr[0]];
+};

src/controllers/custom/getConfigDataController.ts

@@ -1,14 +0,0 @@
-import { RequestHandler } from "express";
-import { config } from "@/src/services/configService";
-import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
-
-const getConfigDataController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    if (isAdministrator(account)) {
-        res.json(config);
-    } else {
-        res.status(401).end();
-    }
-};
-
-export { getConfigDataController };

src/controllers/custom/updateConfigDataController.ts

@@ -1,21 +0,0 @@
-import { RequestHandler } from "express";
-import { saveConfig } from "@/src/services/configWatcherService";
-import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
-import { config, IConfig } from "@/src/services/configService";
-
-export const updateConfigDataController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    if (isAdministrator(account)) {
-        const data = req.body as IUpdateConfigDataRequest;
-        config[data.key] = data.value;
-        await saveConfig();
-        res.end();
-    } else {
-        res.status(401).end();
-    }
-};
-
-interface IUpdateConfigDataRequest {
-    key: keyof IConfig;
-    value: never;
-}

src/routes/custom.ts

@@ -25,8 +25,7 @@ import { manageQuestsController } from "@/src/controllers/custom/manageQuestsCon
 import { setEvolutionProgressController } from "@/src/controllers/custom/setEvolutionProgressController";
 import { setBoosterController } from "@/src/controllers/custom/setBoosterController";
 
-import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController";
+import { getConfigController, setConfigController } from "@/src/controllers/custom/configController";
-import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController";
 
 const customRouter = express.Router();
 
@@ -55,7 +54,7 @@ customRouter.post("/manageQuests", manageQuestsController);
 customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
 customRouter.post("/setBooster", setBoosterController);
 
-customRouter.get("/config", getConfigDataController);
+customRouter.post("/getConfig", getConfigController);
-customRouter.post("/config", updateConfigDataController);
+customRouter.post("/setConfig", setConfigController);
 
 export { customRouter };

static/webui/index.html

@@ -568,10 +568,10 @@
                         <div class="card mb-3">
                             <h5 class="card-header" data-loc="cheats_server"></h5>
                             <div class="card-body">
-                                <div id="server-settings-no-perms" class="d-none">
+                                <div class="d-none config-admin-hide">
                                     <p class="card-text" data-loc="cheats_administratorRequirement"></p>
                                 </div>
-                                <div id="server-settings" class="d-none">
+                                <div class="d-none config-admin-show config-form">
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="skipTutorial" />
                                         <label class="form-check-label" for="skipTutorial" data-loc="cheats_skipTutorial"></label>
@@ -807,6 +807,27 @@
                                 </form>
                             </div>
                         </div>
+                        <div class="card mb-3 d-none config-admin-show config-form">
+                            <h5 class="card-header" data-loc="worldState"></h5>
+                            <div class="card-body">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="worldState.creditBoost" />
+                                    <label class="form-check-label" for="worldState.creditBoost" data-loc="worldState_creditBoost"></label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="worldState.affinityBoost" />
+                                    <label class="form-check-label" for="worldState.affinityBoost" data-loc="worldState_affinityBoost"></label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="worldState.resourceBoost" />
+                                    <label class="form-check-label" for="worldState.resourceBoost" data-loc="worldState_resourceBoost"></label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="worldState.starDays" />
+                                    <label class="form-check-label" for="worldState.starDays" data-loc="worldState_starDays"></label>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

static/webui/script.js

@@ -1847,16 +1847,16 @@ function doAcquireMod() {
     }
 }
 
-const uiConfigs = [...$("#server-settings input[id]")].map(x => x.id);
+const uiConfigs = [...$(".config-form input[id]")].map(x => x.id);
 
 for (const id of uiConfigs) {
     const elm = document.getElementById(id);
     if (elm.type == "checkbox") {
         elm.onchange = function () {
             $.post({
-                url: "/custom/config?" + window.authz,
+                url: "/custom/setConfig?" + window.authz,
                 contentType: "application/json",
-                data: JSON.stringify({ key: id, value: this.checked })
+                data: JSON.stringify({ [id]: this.checked })
             }).then(() => {
                 if (["infiniteCredits", "infinitePlatinum", "infiniteEndo", "infiniteRegalAya"].indexOf(id) != -1) {
                     updateInventory();
@@ -1869,9 +1869,9 @@ for (const id of uiConfigs) {
 function doSaveConfig(id) {
     const elm = document.getElementById(id);
     $.post({
-        url: "/custom/config?" + window.authz,
+        url: "/custom/setConfig?" + window.authz,
         contentType: "application/json",
-        data: JSON.stringify({ key: id, value: parseInt(elm.value) })
+        data: JSON.stringify({ [id]: parseInt(elm.value) })
     });
 }
 
@@ -1882,12 +1882,14 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
     interval = setInterval(() => {
         if (window.authz) {
             clearInterval(interval);
-            fetch("/custom/config?" + window.authz).then(async res => {
+            $.post({
-                if (res.status == 200) {
+                url: "/custom/getConfig?" + window.authz,
+                contentType: "application/json",
+                data: JSON.stringify(uiConfigs)
+            }).done(json => {
                 //window.is_admin = true;
-                    $("#server-settings-no-perms").addClass("d-none");
+                $(".config-admin-hide").addClass("d-none");
-                    $("#server-settings").removeClass("d-none");
+                $(".config-admin-show").removeClass("d-none");
-                    res.json().then(json =>
                 Object.entries(json).forEach(entry => {
                     const [key, value] = entry;
                     var x = document.getElementById(`${key}`);
@@ -1898,10 +1900,9 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                             x.setAttribute("value", `${value}`);
                         }
                     }
-                        })
+                });
-                    );
+            }).fail(res => {
-                } else {
+                if (res.responseText == "Log-in expired") {
-                    if ((await res.text()) == "Log-in expired") {
                     revalidateAuthz().then(() => {
                         if (single.getCurrentPath() == "/webui/cheats") {
                             single.loadRoute("/webui/cheats");
@@ -1909,9 +1910,8 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                     });
                 } else {
                     //window.is_admin = false;
-                        $("#server-settings-no-perms").removeClass("d-none");
+                    $(".config-admin-hide").removeClass("d-none");
-                        $("#server-settings").addClass("d-none");
+                    $(".config-admin-show").addClass("d-none");
-                    }
                 }
             });
         }

static/webui/translations/de.js

@@ -186,6 +186,13 @@ dict = {
     cheats_changeSupportedSyndicate: `Unterstütztes Syndikat`,
     cheats_changeButton: `Ändern`,
     cheats_none: `Keines`,
+
+    worldState: `[UNTRANSLATED] World State`,
+    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
+    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
+    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
+    worldState_starDays: `[UNTRANSLATED] Star Days`,
+
     import_importNote: `Du kannst hier eine vollständige oder teilweise Inventarantwort (Client-Darstellung) einfügen. Alle Felder, die vom Importer unterstützt werden, <b>werden in deinem Account überschrieben</b>.`,
     import_submit: `Absenden`,
     import_samples: `[UNTRANSLATED] Samples:`,

static/webui/translations/en.js

@@ -185,6 +185,13 @@ dict = {
     cheats_changeSupportedSyndicate: `Supported syndicate`,
     cheats_changeButton: `Change`,
     cheats_none: `None`,
+
+    worldState: `World State`,
+    worldState_creditBoost: `Credit Boost`,
+    worldState_affinityBoost: `Affinity Boost`,
+    worldState_resourceBoost: `Resource Boost`,
+    worldState_starDays: `Star Days`,
+
     import_importNote: `You can provide a full or partial inventory response (client respresentation) here. All fields that are supported by the importer <b>will be overwritten</b> in your account.`,
     import_submit: `Submit`,
     import_samples: `Samples:`,

static/webui/translations/es.js

@@ -186,6 +186,13 @@ dict = {
     cheats_changeSupportedSyndicate: `Sindicatos disponibles`,
     cheats_changeButton: `Cambiar`,
     cheats_none: `Ninguno`,
+
+    worldState: `[UNTRANSLATED] World State`,
+    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
+    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
+    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
+    worldState_starDays: `[UNTRANSLATED] Star Days`,
+
     import_importNote: `Puedes proporcionar una respuesta de inventario completa o parcial (representación del cliente) aquí. Todos los campos compatibles con el importador <b>serán sobrescritos</b> en tu cuenta.`,
     import_submit: `Enviar`,
     import_samples: `Muestras:`,

static/webui/translations/fr.js

@@ -186,6 +186,13 @@ dict = {
     cheats_changeSupportedSyndicate: `Allégeance`,
     cheats_changeButton: `Changer`,
     cheats_none: `Aucun`,
+
+    worldState: `[UNTRANSLATED] World State`,
+    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
+    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
+    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
+    worldState_starDays: `[UNTRANSLATED] Star Days`,
+
     import_importNote: `Import manuel. Toutes les modifcations supportées par l'inventaire <b>écraseront celles présentes dans la base de données</b>.`,
     import_submit: `Soumettre`,
     import_samples: `Echantillons :`,

static/webui/translations/ru.js

@@ -186,6 +186,13 @@ dict = {
     cheats_changeSupportedSyndicate: `Поддерживаемый синдикат`,
     cheats_changeButton: `Изменить`,
     cheats_none: `Отсутствует`,
+
+    worldState: `[UNTRANSLATED] World State`,
+    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
+    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
+    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
+    worldState_starDays: `[UNTRANSLATED] Star Days`,
+
     import_importNote: `Вы можете загрузить полный или частичный ответ инвентаря (клиентское представление) здесь. Все поддерживаемые поля <b>будут перезаписаны</b> в вашем аккаунте.`,
     import_submit: `Отправить`,
     import_samples: `[UNTRANSLATED] Samples:`,

static/webui/translations/zh.js

@@ -186,6 +186,13 @@ dict = {
     cheats_changeSupportedSyndicate: `支持的集团`,
     cheats_changeButton: `更改`,
     cheats_none: `无`,
+
+    worldState: `[UNTRANSLATED] World State`,
+    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
+    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
+    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
+    worldState_starDays: `[UNTRANSLATED] Star Days`,
+
     import_importNote: `您可以在此处提供完整或部分库存响应（客户端表示）。支持的所有字段<b>将被覆盖</b>到您的账户中。`,
     import_submit: `提交`,
     import_samples: `示例:`,