migrate settings apis to new api

astudentinearth · Jan 8, 2025 · a753925 · a753925
1 parent 9a9ef8c
commit a753925
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/.../app-desktop/src/electron/api/settings.ts → ...top/src/electron/api/settings.electron.ts b/.../app-desktop/src/electron/api/settings.ts → ...top/src/electron/api/settings.electron.ts
@@ -1,12 +1,15 @@
 import {
   DEFAULT_USER_SETTINGS,
+  DarkwriteDesktopClientInfo,
   UserSettings,
   buildUserSettings,
 } from "@darkwrite/common";
 import log from "electron-log/main.js";
 import { FileHandle, open, writeFile } from "fs/promises";
 import { SETTINGS_PATH } from "../lib/paths";
 import { isNodeError, isValidJSON } from "../util";
+import { app } from "electron";
+import os from "os";
 
 const filename = SETTINGS_PATH;
 
@@ -62,3 +65,13 @@ export async function writeUserPrefs(prefs: UserSettings) {
     if (isNodeError(err)) log.error(err.message);
   }
 }
+
+export function getAppInfo(): DarkwriteDesktopClientInfo {
+  return {
+    isPackaged: app.isPackaged,
+    version: app.getVersion(),
+    os: `${os.type()} ${os.release()}`,
+    nodeVersion: process.versions.node,
+    electronVersion: process.versions.electron,
+  };
+}
diff --git a/packages/app-desktop/src/electron/ipc/api.ts b/packages/app-desktop/src/electron/ipc/api.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import * as NoteAPI from "@main/api/note.electron";
+import * as SettingsAPI from "@main/api/settings.electron"
 // @ts-ignore
 import {ImportAPI as FileImportAPI} from "@main/api/import"
 import { deepAssign, find, recursiveKeys } from "@darkwrite/common";
@@ -21,6 +22,11 @@ export const DarkwriteElectronAPI = {
     export: new IPCHandler(false, NoteAPI.exportNote),
     import: new IPCHandler(false, FileImportAPI.importFile),
   },
+  settings: {
+    load: new IPCHandler(false, SettingsAPI.readUserPrefs),
+    save: new IPCHandler(false, SettingsAPI.writeUserPrefs),
+    getClientInfo: new IPCHandler(false, SettingsAPI.getAppInfo)
+  }
 } satisfies DarkwriteAPI;
 export type DarkwritePreloadAPI = InferPreloadAPI<typeof DarkwriteElectronAPI>;
 

diff --git a/packages/app-desktop/src/electron/ipc/settings.ts b/packages/app-desktop/src/electron/ipc/settings.ts
@@ -1,6 +1,7 @@
+/** @deprecated */
 import { DarkwriteDesktopClientInfo, UserSettings } from "@darkwrite/common";
 import { app, ipcMain } from "electron";
-import { readUserPrefs, writeUserPrefs } from "../api/settings";
+import { readUserPrefs, writeUserPrefs } from "../api/settings.electron";
 import { ChannelNames } from "../channels";
 import os from "os";
 

diff --git a/packages/app-desktop/src/electron/main.ts b/packages/app-desktop/src/electron/main.ts
@@ -11,7 +11,7 @@ import { initAppMenu } from "./menu";
 } from "electron-devtools-installer";*/
 import { DEFAULT_USER_SETTINGS } from "@darkwrite/common";
 import { fileURLToPath } from "node:url";
-import { readUserPrefs } from "./api/settings";
+import { readUserPrefs } from "./api/settings.electron";
 import { Paths } from "./lib/paths";
 import { constructWindow } from "./window";
 import "./ipc/api"

diff --git a/packages/app-desktop/src/lib/api/client.ts b/packages/app-desktop/src/lib/api/client.ts
@@ -3,7 +3,7 @@ import { DarkwriteDesktopClientInfo } from "@darkwrite/common";
 export const ClientAPI = {
   getClientInfo: async (): Promise<DarkwriteDesktopClientInfo> => {
     if (window.api) {
-      return await window.api.getClientInfo();
+      return await window.newApi.settings.getClientInfo();
     }
     return {
       electronVersion: "",

diff --git a/packages/app-desktop/src/lib/api/settings.ts b/packages/app-desktop/src/lib/api/settings.ts
@@ -2,9 +2,9 @@ import { UserSettings } from "@darkwrite/common";
 
 export const SettingsModel = {
   async save(data: UserSettings) {
-    window.api.settings.save(data);
+    window.newApi.settings.save(data);
   },
   async load() {
-    return await window.api.settings.load();
+    return await window.newApi.settings.load();
   },
 };