Rewrite settings proxy to proper store

src/main/index.ts

@@ -63,7 +63,7 @@ async function createWindows() {
         splash.destroy();
         mainWin!.show();
 
-        if (Settings.maximized) {
+        if (Settings.store.maximized) {
             mainWin!.maximize();
         }
     });

src/main/ipc.ts

@@ -13,7 +13,7 @@ import { debounce } from "shared/utils/debounce";
 import { IpcEvents } from "../shared/IpcEvents";
 import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE } from "./constants";
 import { mainWin } from "./mainWindow";
-import { PlainSettings, setSettings } from "./settings";
+import { Settings } from "./settings";
 
 ipcMain.on(IpcEvents.GET_VENCORD_PRELOAD_FILE, e => {
     e.returnValue = join(VENCORD_FILES_DIR, "preload.js");
@@ -32,7 +32,7 @@ ipcMain.on(IpcEvents.GET_RENDERER_CSS_FILE, e => {
 });
 
 ipcMain.on(IpcEvents.GET_SETTINGS, e => {
-    e.returnValue = PlainSettings;
+    e.returnValue = Settings.plain;
 });
 
 ipcMain.on(IpcEvents.GET_VERSION, e => {
@@ -40,7 +40,7 @@ ipcMain.on(IpcEvents.GET_VERSION, e => {
 });
 
 ipcMain.handle(IpcEvents.SET_SETTINGS, (_, settings) => {
-    setSettings(settings);
+    Settings.setData(settings);
 });
 
 ipcMain.handle(IpcEvents.RELAUNCH, () => {

src/main/mainWindow.ts

@@ -78,7 +78,7 @@ function initTray(win: BrowserWindow) {
 
 function initMenuBar(win: BrowserWindow) {
     const isWindows = process.platform === "win32";
-    const wantCtrlQ = !isWindows || VencordSettings.winCtrlQ;
+    const wantCtrlQ = !isWindows || VencordSettings.store.winCtrlQ;
 
     const menu = Menu.buildFromTemplate([
         {
@@ -174,7 +174,7 @@ function initMenuBar(win: BrowserWindow) {
 }
 
 function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
-    const { x, y, width, height } = Settings.windowBounds ?? {};
+    const { x, y, width, height } = Settings.store.windowBounds ?? {};
 
     const options = {
         width: width ?? DEFAULT_WIDTH,
@@ -186,7 +186,7 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
         options.y = y;
     }
 
-    if (!Settings.disableMinSize) {
+    if (!Settings.store.disableMinSize) {
         options.minWidth = MIN_WIDTH;
         options.minHeight = MIN_HEIGHT;
     }
@@ -196,8 +196,8 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
 
 function initWindowBoundsListeners(win: BrowserWindow) {
     const saveState = () => {
-        Settings.maximized = win.isMaximized();
-        Settings.minimized = win.isMinimized();
+        Settings.store.maximized = win.isMaximized();
+        Settings.store.minimized = win.isMinimized();
     };
 
     win.on("maximize", saveState);
@@ -205,7 +205,7 @@ function initWindowBoundsListeners(win: BrowserWindow) {
     win.on("unmaximize", saveState);
 
     const saveBounds = () => {
-        Settings.windowBounds = win.getBounds();
+        Settings.store.windowBounds = win.getBounds();
     };
 
     win.on("resize", saveBounds);
@@ -224,12 +224,12 @@ export function createMainWindow() {
             preload: join(__dirname, "preload.js")
         },
         icon: ICON_PATH,
-        frame: VencordSettings.frameless !== true,
+        frame: VencordSettings.store.frameless !== true,
         ...getWindowBoundsOptions()
     }));
 
     win.on("close", e => {
-        if (isQuitting || Settings.minimizeToTray === false) return;
+        if (isQuitting || Settings.store.minimizeToTray === false) return;
 
         e.preventDefault();
         win.hide();
@@ -243,7 +243,9 @@ export function createMainWindow() {
     makeLinksOpenExternally(win);
 
     const subdomain =
-        Settings.discordBranch === "canary" || Settings.discordBranch === "ptb" ? `${Settings.discordBranch}.` : "";
+        Settings.store.discordBranch === "canary" || Settings.store.discordBranch === "ptb"
+            ? `${Settings.store.discordBranch}.`
+            : "";
 
     win.loadURL(`https://${subdomain}discord.com/app`);
 

src/main/settings.ts

@@ -7,7 +7,7 @@
 import { readFileSync, writeFileSync } from "fs";
 import { join } from "path";
 import type { Settings as TSettings } from "shared/settings";
-import { makeChangeListenerProxy } from "shared/utils/makeChangeListenerProxy";
+import { SettingsStore } from "shared/utils/makeChangeListenerProxy";
 
 import { DATA_DIR, VENCORD_SETTINGS_FILE } from "./constants";
 
@@ -24,23 +24,11 @@ function loadSettings<T extends object = any>(file: string, name: string) {
         }
     } catch {}
 
-    const makeSettingsProxy = (settings: T) =>
-        makeChangeListenerProxy(settings, target => writeFileSync(file, JSON.stringify(target, null, 4)));
+    const store = new SettingsStore(settings);
+    store.addGlobalChangeListener(o => writeFileSync(file, JSON.stringify(o, null, 4)));
 
-    return [settings, makeSettingsProxy] as const;
+    return store;
 }
 
-// eslint-disable-next-line prefer-const
-let [PlainSettings, makeSettingsProxy] = loadSettings<TSettings>(SETTINGS_FILE, "VencordDesktop");
-export let Settings = makeSettingsProxy(PlainSettings);
-
-const [PlainVencordSettings, makeVencordSettingsProxy] = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord");
-export const VencordSettings = makeVencordSettingsProxy(PlainVencordSettings);
-
-export function setSettings(settings: TSettings) {
-    writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 4));
-    PlainSettings = settings;
-    Settings = makeSettingsProxy(settings);
-}
-
-export { PlainSettings, PlainVencordSettings };
+export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vencord Desktop");
+export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord");

src/main/utils/makeLinksOpenExternally.ts

@@ -25,7 +25,7 @@ export function makeLinksOpenExternally(win: BrowserWindow) {
         switch (protocol) {
             case "http:":
             case "https:":
-                if (Settings.openLinksWithElectron) {
+                if (Settings.store.openLinksWithElectron) {
                     return { action: "allow" };
                 }
             // eslint-disable-next-line no-fallthrough