improve types

desktop/electron/src/ipc.ts

@@ -2,8 +2,8 @@ import { ipcMain, app } from "electron";
 import electronIsDev from "electron-is-dev";
 import { createAndShowNotification } from "./notification";
 import { Server } from "./preload-local-app/types";
-import settings from "./settings";
-import { saveShortcut } from "./shortcuts";
+import settings, { SettingsData } from "./settings";
+import { loadShortcuts, saveShortcut } from "./shortcuts";
 import { getWindow, hideAppView, showAppView } from "./window";
 
 export function emitMuteToggle() {
@@ -92,7 +92,10 @@ export default () => {
         return true;
     });
 
-    ipcMain.handle("local-app:saveShortcut", (event, shortcut, key) => saveShortcut(shortcut, key));
+    ipcMain.handle("local-app:reloadShortcuts", (event, shortcut, key) => loadShortcuts());
 
-    ipcMain.handle("local-app:getShortcuts", (event) => settings.get("shortcuts") || {});
+    ipcMain.handle("local-app:getSettings", (event) => settings.get() || {});
+    ipcMain.handle("local-app:saveSetting", <T extends keyof SettingsData>(event, key: T, value: SettingsData[T]) =>
+        settings.set(key, value)
+    );
 };

desktop/electron/src/preload-app/preload.ts

@@ -1,14 +1,13 @@
 import { contextBridge, ipcRenderer, IpcRendererEvent } from "electron";
-import { SettingsData } from "src/settings";
 import type { WorkAdventureDesktopApi } from "./types";
 
 const api: WorkAdventureDesktopApi = {
     desktop: true,
     isDevelopment: () => ipcRenderer.invoke("is-development"),
     getVersion: () => ipcRenderer.invoke("get-version"),
-    notify: (txt: string) => ipcRenderer.send("app:notify", txt),
-    onMuteToggle: (callback: (event: IpcRendererEvent) => void) => ipcRenderer.on("app:on-mute-toggle", callback),
-    onCameraToggle: (callback: (event: IpcRendererEvent) => void) => ipcRenderer.on("app:on-camera-toggle", callback),
+    notify: (txt) => ipcRenderer.send("app:notify", txt),
+    onMuteToggle: (callback) => ipcRenderer.on("app:on-mute-toggle", callback),
+    onCameraToggle: (callback) => ipcRenderer.on("app:on-camera-toggle", callback),
 };
 
 contextBridge.exposeInMainWorld("WorkAdventureDesktopApi", api);

desktop/electron/src/preload-local-app/preload.ts

@@ -1,6 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron";
-import { SettingsData } from "src/settings";
-import type { Server, WorkAdventureLocalAppApi } from "./types";
+import type { WorkAdventureLocalAppApi } from "./types";
 
 const api: WorkAdventureLocalAppApi = {
     desktop: true,
@@ -8,12 +7,12 @@ const api: WorkAdventureLocalAppApi = {
     getVersion: () => ipcRenderer.invoke("get-version"),
     showLocalApp: () => ipcRenderer.invoke("local-app:showLocalApp"),
     getServers: () => ipcRenderer.invoke("local-app:getServers"),
-    selectServer: (serverId: string) => ipcRenderer.invoke("local-app:selectServer", serverId),
-    addServer: (server: Omit<Server, "_id">) => ipcRenderer.invoke("local-app:addServer", server),
-    removeServer: (serverId: Server["_id"]) => ipcRenderer.invoke("local-app:removeServer", serverId),
-    saveShortcut: (shortcut: keyof SettingsData["shortcuts"], key: string | null) =>
-        ipcRenderer.invoke("local-app:saveShortcut", shortcut, key),
-    getShortcuts: () => ipcRenderer.invoke("local-app:getShortcuts"),
+    selectServer: (serverId) => ipcRenderer.invoke("local-app:selectServer", serverId),
+    addServer: (server) => ipcRenderer.invoke("local-app:addServer", server),
+    removeServer: (serverId) => ipcRenderer.invoke("local-app:removeServer", serverId),
+    reloadShortcuts: () => ipcRenderer.invoke("local-app:reloadShortcuts"),
+    getSettings: () => ipcRenderer.invoke("local-app:getSettings"),
+    saveSetting: (key, value) => ipcRenderer.invoke("local-app:setSetting", key, value),
 };
 
 contextBridge.exposeInMainWorld("WorkAdventureDesktopApi", api);

desktop/electron/src/preload-local-app/types.ts

@@ -1,4 +1,4 @@
-import { SettingsData } from "src/settings";
+import { SettingsData } from "../settings";
 
 export type Server = {
     _id: string;
@@ -6,6 +6,8 @@ export type Server = {
     url: string;
 };
 
+export { SettingsData };
+
 export type WorkAdventureLocalAppApi = {
     desktop: boolean;
     isDevelopment: () => Promise<boolean>;
@@ -13,8 +15,9 @@ export type WorkAdventureLocalAppApi = {
     showLocalApp: () => Promise<void>;
     getServers: () => Promise<Server[]>;
     selectServer: (serverId: string) => Promise<Error | boolean>;
-    addServer: (server: Omit<Server, "_id">) => Promise<Server>;
+    addServer: (server: Omit<Server, "_id">) => Promise<Server | Error>;
     removeServer: (serverId: Server["_id"]) => Promise<boolean>;
-    saveShortcut: (shortcut: keyof SettingsData["shortcuts"], key: string | null) => Promise<void>;
-    getShortcuts: () => Promise<SettingsData["shortcuts"]>;
+    reloadShortcuts: () => Promise<void>;
+    getSettings: () => Promise<SettingsData>;
+    saveSetting: <T extends keyof SettingsData>(key: T, value: SettingsData[T]) => Promise<void>;
 };

desktop/electron/src/settings.ts

@@ -15,20 +15,33 @@ async function init() {
     settings = (await Settings.get()) as SettingsData;
 }
 
-function get<T extends keyof SettingsData>(key: T): SettingsData[T] | undefined {
+function get(): SettingsData;
+function get<T extends keyof SettingsData>(key: T): SettingsData[T] | undefined;
+function get<T extends keyof SettingsData>(key?: T): SettingsData | SettingsData[T] | undefined {
     if (settings === undefined) {
         throw new Error("Settings not initialized");
     }
 
+    if (key === undefined) {
+        return settings;
+    }
+
     return settings?.[key];
 }
 
-export function set<T extends keyof SettingsData>(key: T, value: SettingsData[T]) {
+function set(key: SettingsData): void;
+function set<T extends keyof SettingsData>(key: T, value: SettingsData[T]): void;
+function set<T extends keyof SettingsData>(key: T | SettingsData, value?: SettingsData[T]) {
     if (settings === undefined) {
         throw new Error("Settings not initialized");
     }
 
-    settings[key] = value;
+    if (typeof key === "string") {
+        settings[key] = value;
+    } else {
+        Object.assign(settings, key);
+    }
+
     void Settings.set(settings);
 }