From 56a680b08bb633e0b30a7ac2fd5076f34f9c899c Mon Sep 17 00:00:00 2001
From: OmegaRogue <omegarogue@omegavoid.codes>
Date: Mon, 22 Jan 2024 16:02:37 +0100
Subject: [PATCH] :sparkles: Make local config persistent across instances, Add
 ignore ssl error option to menu

---
 index.html      |  8 +++---
 src/main.ts     | 18 +++++++++++--
 src/preload.ts  |  8 ++++++
 src/renderer.ts | 68 ++++++++++++++++++++++++++++++++++---------------
 src/types.d.ts  |  2 +-
 5 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/index.html b/index.html
index a84ef35..1204182 100644
--- a/index.html
+++ b/index.html
@@ -101,6 +101,10 @@
                 <label for="clear-cache-on-close">Clear Cache on close</label>
                 <input class="no-text" id="clear-cache-on-close" type="checkbox">
             </div>
+            <div class="insecure-ssl-field field">
+                <label for="clear-cache-on-close">Ignore Certificate errors</label>
+                <input class="no-text" id="insecure-ssl" type="checkbox">
+            </div>
             <div class="button-group">
                 <button id="clear-cache">Clear Cache</button>
                 <button id="save-app-config">Save</button>
@@ -113,9 +117,7 @@ <h3>Put this in your <code>config.json</code> file to include it installation-wi
             <button onclick="copyText()">Copy</button>
             <button onclick="toggleExportConfig()">Close</button>
             <script>
-                const gamesList = JSON.parse(window.localStorage.getItem("gameList") || "[]");
-                const appConfig = JSON.parse(window.localStorage.getItem("appConfig") || "{}");
-                const config = {...appConfig, games: gamesList};
+                const config = await window.api.localAppConfig();
                 code = document.getElementById("export-text");
                 const text = JSON.stringify(config, null, 4);
                 txt = document.createTextNode(text);
diff --git a/src/main.ts b/src/main.ts
index bcf69b1..7054912 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -47,7 +47,6 @@ const windowsData = {} as WindowsData;
 let partitionId: number = 0;
 
 function getSession(): Electron.Session {
-    if (!getAppConfig().experimentalMultiInstance) return session.defaultSession;
     const partitionIdTemp = partitionId;
     partitionId++
     if (partitionIdTemp == 0)
@@ -245,17 +244,32 @@ ipcMain.handle("app-version", () => app.getVersion())
 function getAppConfig(): AppConfig {
     try {
         const json = fs.readFileSync(path.join(app.getAppPath(), "config.json")).toString();
-        const appConfig = JSON.parse(json) as AppConfig;
+        let appConfig = JSON.parse(json) as AppConfig;
         if (appConfig.ignoreCertificateErrors) {
             app.commandLine.appendSwitch("ignore-certificate-errors");
         }
+        const userData = getUserData();
+        appConfig = {...appConfig, ...userData.app};
         return appConfig;
     } catch (e) {
         return {} as AppConfig;
     }
 }
 
+ipcMain.on("save-app-config", (_e, data: AppConfig) => {
+    const currentData = getUserData();
+    currentData.app = {...currentData.app, ...data};
+    fs.writeFileSync(path.join(app.getPath("userData"), "userData.json"), JSON.stringify(currentData));
+});
 ipcMain.handle("app-config", getAppConfig);
+ipcMain.handle("local-app-config", () => {
+    try {
+        const userData = getUserData();
+        return userData.app ?? {} as AppConfig;
+    } catch (e) {
+        return {} as AppConfig;
+    }
+});
 
 ipcMain.handle("select-path", (e) => {
     windowsData[e.sender.id].autoLogin = true;
diff --git a/src/preload.ts b/src/preload.ts
index ca259e9..51a03d2 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -30,12 +30,14 @@ export type ContextBridgeApi = {
     userData: (gameId: string | number) => Promise<GameUserDataDecrypted>;
     appVersion: () => Promise<string>;
     appConfig: () => Promise<AppConfig>;
+    localAppConfig: () => Promise<AppConfig>;
     cachePath: () => Promise<string>;
     setCachePath: (cachePath: string) => void;
     returnToServerSelect: () => void;
     saveUserData: (data: SaveUserData) => void;
     openGame: (id: number | string) => void;
     clearCache: () => void;
+    saveAppConfig: (data: AppConfig) => void;
 }
 const exposedApi: ContextBridgeApi = {
     // request(channel: RequestChannels, ...args: unknown[]): Promise<unknown> {
@@ -54,6 +56,9 @@ const exposedApi: ContextBridgeApi = {
     appConfig() {
         return ipcRenderer.invoke("app-config") as Promise<AppConfig>;
     },
+    localAppConfig() {
+        return ipcRenderer.invoke("local-app-config") as Promise<AppConfig>;
+    },
     appVersion() {
         return ipcRenderer.invoke("app-version") as Promise<string>;
     },
@@ -75,6 +80,9 @@ const exposedApi: ContextBridgeApi = {
     setCachePath(cachePath: string) {
         ipcRenderer.send("cache-path", cachePath);
     },
+    saveAppConfig(data: AppConfig) {
+        ipcRenderer.send("save-app-config", data);
+    }
 
 
 }
diff --git a/src/renderer.ts b/src/renderer.ts
index 14d8138..00a0187 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -22,20 +22,26 @@ function compareSemver(a: string, b: string): number {
     return 0
 }
 
-document.querySelector("#add-game").addEventListener("click", () => {
+async function updateGameList(task: (appConfig: AppConfig) => void) {
+    const appConfig = await window.api.localAppConfig();
+    task(appConfig);
+    window.api.saveAppConfig(appConfig);
+}
+
+
+document.querySelector("#add-game").addEventListener("click", async () => {
     const gameUrlField = document.querySelector("#game-url") as HTMLInputElement;
     const gameNameField = document.querySelector("#game-name") as HTMLInputElement;
     const gameUrl = gameUrlField.value;
     const gameName = gameNameField.value;
     if (!gameUrl || !gameName) return alert("Please enter a game name and url");
-    const gameList = window.localStorage.getItem("gameList") || "[]";
-    const gameListJson: GameConfig[] = JSON.parse(gameList);
     const newGameItem = {name: gameName, url: gameUrl, id: Math.round(Math.random() * 1000000)} as GameConfig;
-    gameListJson.push(newGameItem);
-    window.localStorage.setItem("gameList", JSON.stringify(gameListJson));
+    await updateGameList((appConfig) => {
+        appConfig.games.push(newGameItem);
+    });
     gameUrlField.value = "";
     gameNameField.value = "";
-    createGameItem(newGameItem);
+    await createGameItem(newGameItem);
 });
 
 
@@ -54,9 +60,18 @@ document.querySelector("#save-app-config").addEventListener("click", (e) => {
     const textColor = (closeUserConfig.querySelector("#text-color") as HTMLInputElement).value;
     const cachePath = (closeUserConfig.querySelector("#cache-path") as HTMLInputElement).value;
     const autoCacheClear = (closeUserConfig.querySelector("#cache-path") as HTMLInputElement).checked;
-    const config = {accentColor, backgroundColor, background, textColor, cachePath, autoCacheClear} as AppConfig;
+    const ignoreCertificateErrors = (closeUserConfig.querySelector("#insecure-ssl") as HTMLInputElement).checked;
+    const config = {
+        accentColor,
+        backgroundColor,
+        background,
+        textColor,
+        cachePath,
+        autoCacheClear,
+        ignoreCertificateErrors
+    } as AppConfig;
     console.log(config);
-    window.localStorage.setItem("appConfig", JSON.stringify(config));
+    window.api.saveAppConfig(config);
     applyAppConfig(config);
 });
 
@@ -81,12 +96,11 @@ async function createGameItem(game: GameConfig) {
     gameItemList.appendChild(li);
     const userConfiguration = li.querySelector("div.user-configuration") as HTMLDivElement;
     userConfiguration.style.height = `${userConfiguration.scrollHeight}px`;
-    userConfiguration.querySelector("#delete-game")?.addEventListener("click", () => {
-        const gameList = window.localStorage.getItem("gameList") || "[]";
-        const gameListJson: GameConfig[] = JSON.parse(gameList);
-        const newGameList = gameListJson.filter((g) => g.id !== game.id);
-        window.localStorage.setItem("gameList", JSON.stringify(newGameList));
-        createGameList();
+    userConfiguration.querySelector("#delete-game")?.addEventListener("click", async () => {
+        await updateGameList((appConfig) => {
+            appConfig.games = appConfig.games.filter((g) => g.id !== game.id);
+        });
+        await createGameList();
     });
     const gameId = game.id ?? game.name;
     const saveButton = userConfiguration.querySelector("#save-user-data") as HTMLButtonElement;
@@ -140,14 +154,31 @@ function addStyle(styleString: string) {
     document.head.append(style);
 }
 
+async function migrateConfig() {
+    let localAppConfig = await window.api.localAppConfig();
+    const gameList: GameConfig[] = JSON.parse(window.localStorage.getItem("gameList") || "[]");
+    if (gameList.length > 0) {
+        localAppConfig.games = localAppConfig?.games ?? [];
+        localAppConfig.games.push(...gameList);
+        window.localStorage.removeItem("gameList");
+    }
+    const oldConfigJson = window.localStorage.getItem("appConfig") || "{}";
+    if (oldConfigJson !== "{}") {
+        const oldConfig = (JSON.parse(oldConfigJson) as AppConfig);
+        localAppConfig = {...localAppConfig, ...oldConfig};
+        window.localStorage.removeItem("appConfig");
+    }
+    window.api.saveAppConfig(localAppConfig);
+}
+
 async function createGameList() {
+    await migrateConfig();
     let config: AppConfig;
     try {
         config = await window.api.appConfig();
     } catch (e) {
         console.log("Failed to load config.json");
     }
-    config = {...config, ...(JSON.parse(window.localStorage.getItem("appConfig") || "{}") as AppConfig)};
 
     addStyle(config.customCSS ?? "");
 
@@ -162,17 +193,14 @@ async function createGameList() {
 
     applyAppConfig(config);
 
-
     gameItemList.childNodes.forEach((value) => {
             if (value.nodeName === "template")
                 return;
             value.remove();
         }
     );
-    const gameList = window.localStorage.getItem("gameList") || "[]";
-    let gameListJson: GameConfig[] = JSON.parse(gameList);
-    gameListJson = [...config.games, ...gameListJson];
-    gameListJson.forEach(createGameItem);
+
+    config.games.forEach(createGameItem);
 }
 
 while (!window) {
diff --git a/src/types.d.ts b/src/types.d.ts
index df24de8..6686842 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -24,13 +24,13 @@ type AppConfig = {
     autoCacheClear?: boolean;
     customCSS?: string;
     ignoreCertificateErrors?: boolean;
-    experimentalMultiInstance?: boolean;
 }
 
 
 type UserData = {
     cachePath?: string;
     [index: GameId]: GameUserData;
+    app?: AppConfig;
 }
 
 type GameUserData = {