feat(webui): automatically commit toggle changes (#2198)

Closes #2197

Reviewed-on: OpenWF/SpaceNinjaServer#2198
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

src/controllers/custom/updateConfigDataController.ts

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

src/services/configService.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { repoDir } from "@/src/helpers/pathHelper";
 
-interface IConfig {
+export interface IConfig {
     mongodbUrl: string;
     logger: {
         files: boolean;

src/services/configWatcherService.ts

@@ -46,12 +46,6 @@ export const validateConfig = (): void => {
     }
 };
 
-export const updateConfig = async (data: string): Promise<void> => {
-    amnesia = true;
-    await fsPromises.writeFile(configPath, data);
-    Object.assign(config, JSON.parse(data));
-};
-
 export const saveConfig = async (): Promise<void> => {
     amnesia = true;
     await fsPromises.writeFile(configPath, JSON.stringify(config, null, 2));

static/webui/index.html

@@ -571,7 +571,7 @@
                                 <div id="server-settings-no-perms" class="d-none">
                                     <p class="card-text" data-loc="cheats_administratorRequirement"></p>
                                 </div>
-                                <form id="server-settings" class="d-none" onsubmit="doChangeSettings();return false;">
+                                <div id="server-settings" class="d-none">
                                     <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>
@@ -732,16 +732,21 @@
                                         <input class="form-check-input" type="checkbox" id="fastClanAscension" />
                                         <label class="form-check-label" for="fastClanAscension" data-loc="cheats_fastClanAscension"></label>
                                     </div>
-                                    <div class="form-group mt-2">
+                                    <form class="form-group mt-2" onsubmit="doSaveConfig('spoofMasteryRank'); return false;">
                                         <label class="form-label" for="spoofMasteryRank" data-loc="cheats_spoofMasteryRank"></label>
-                                        <input class="form-control" id="spoofMasteryRank" type="number" min="-1" max="65535" />
+                                        <div class="input-group">
-                                    </div>
+                                            <input class="form-control" id="spoofMasteryRank" type="number" min="-1" max="65535" />
-                                    <div class="form-group mt-2">
+                                            <button class="btn btn-primary" type="submit" data-loc="cheats_save"></button>
+                                        </div>
+                                    </form>
+                                    <form class="form-group mt-2" onsubmit="doSaveConfig('nightwaveStandingMultiplier'); return false;">
                                         <label class="form-label" for="nightwaveStandingMultiplier" data-loc="cheats_nightwaveStandingMultiplier"></label>
-                                        <input class="form-control" id="nightwaveStandingMultiplier" type="number" min="1" max="1000000" value="1" />
+                                        <div class="input-group">
-                                    </div>
+                                            <input class="form-control" id="nightwaveStandingMultiplier" type="number" min="1" max="1000000" value="1" />
-                                    <button class="btn btn-primary mt-3" type="submit" data-loc="cheats_saveSettings"></button>
+                                            <button class="btn btn-primary" type="submit" data-loc="cheats_save"></button>
-                                </form>
+                                        </div>
+                                    </form>
+                                </div>
                             </div>
                         </div>
                     </div>

static/webui/script.js

@@ -1761,34 +1761,29 @@ function doAcquireMod() {
 
 const uiConfigs = [...$("#server-settings input[id]")].map(x => x.id);
 
-function doChangeSettings() {
+for (const id of uiConfigs) {
-    revalidateAuthz(() => {
+    const elm = document.getElementById(id);
-        fetch("/custom/config?" + window.authz)
+    if (elm.type == "checkbox") {
-            .then(response => response.json())
+        elm.onchange = function () {
-            .then(json => {
+            $.post({
-                for (const i of uiConfigs) {
+                url: "/custom/config?" + window.authz,
-                    var x = document.getElementById(i);
+                contentType: "application/json",
-                    if (x != null) {
+                data: JSON.stringify({ key: id, value: this.checked })
-                        if (x.type == "checkbox") {
+            }).then(() => {
-                            if (x.checked === true) {
+                if (["infiniteCredits", "infinitePlatinum", "infiniteEndo", "infiniteRegalAya"].indexOf(id) != -1) {
-                                json[i] = true;
-                            } else {
-                                json[i] = false;
-                            }
-                        } else if (x.type == "number") {
-                            json[i] = parseInt(x.value);
-                        }
-                    }
-                }
-                $.post({
-                    url: "/custom/config?" + window.authz,
-                    contentType: "text/plain",
-                    data: JSON.stringify(json, null, 2)
-                }).then(() => {
-                    // A few cheats affect the inventory response which in turn may change what values we need to show
                     updateInventory();
-                });
+                }
             });
+        };
+    }
+}
+
+function doSaveConfig(id) {
+    const elm = document.getElementById(id);
+    $.post({
+        url: "/custom/config?" + window.authz,
+        contentType: "application/json",
+        data: JSON.stringify({ key: id, value: parseInt(elm.value) })
     });
 }
 

static/webui/translations/de.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `Schneller Clan-Aufstieg`,
     cheats_spoofMasteryRank: `Gefälschter Meisterschaftsrang (-1 zum deaktivieren)`,
     cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
-    cheats_saveSettings: `Einstellungen speichern`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`,
     cheats_helminthUnlockAll: `Helminth vollständig aufleveln`,

static/webui/translations/en.js

@@ -166,7 +166,7 @@ dict = {
     cheats_fastClanAscension: `Fast Clan Ascension`,
     cheats_spoofMasteryRank: `Spoofed Mastery Rank (-1 to disable)`,
     cheats_nightwaveStandingMultiplier: `Nightwave Standing Multiplier`,
-    cheats_saveSettings: `Save Settings`,
+    cheats_save: `Save`,
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Unlock All Focus Schools`,
     cheats_helminthUnlockAll: `Fully Level Up Helminth`,

static/webui/translations/es.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `Ascenso rápido del clan`,
     cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`,
     cheats_nightwaveStandingMultiplier: `Multiplicador de Reputación de Onda Nocturna`,
-    cheats_saveSettings: `Guardar configuración`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `Cuenta`,
     cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`,
     cheats_helminthUnlockAll: `Subir al máximo el Helminto`,

static/webui/translations/fr.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `Ascension de clan rapide`,
     cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`,
     cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
-    cheats_saveSettings: `Sauvegarder les paramètres`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `Compte`,
     cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`,
     cheats_helminthUnlockAll: `Helminth niveau max`,

static/webui/translations/ru.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `Мгновенное Вознесение Клана`,
     cheats_spoofMasteryRank: `Подделанный ранг мастерства (-1 для отключения)`,
     cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
-    cheats_saveSettings: `Сохранить настройки`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `Аккаунт`,
     cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`,
     cheats_helminthUnlockAll: `Полностью улучшить Гельминта`,

static/webui/translations/zh.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `快速升级氏族`,
     cheats_spoofMasteryRank: `伪造精通段位(-1为禁用)`,
     cheats_nightwaveStandingMultiplier: `午夜电波声望倍率`,
-    cheats_saveSettings: `保存设置`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `账户`,
     cheats_unlockAllFocusSchools: `解锁所有专精学派`,
     cheats_helminthUnlockAll: `完全升级Helminth`,