Use new backend for config update

Author: joshuatowner

src/ts/backend/config/index.ts

@@ -7,12 +7,13 @@ import * as fs from "fs";
 const CONFIG_FILE_NAME = "config.json";
 let config: Config | undefined = undefined;
 
-const getConfigFolder = async () => electron.ipcRenderer.invoke('config-file-name');
+const getConfigFolder = async () => electron.app.getPath('userData');
 const getConfigFile = async () => path.join(await getConfigFolder(), CONFIG_FILE_NAME);
 
 export async function loadConfig() {
   const fileName = await getConfigFile();
   try {
+    console.log(`Reading configuration file: ${fileName}`);
     const contents = await fs.promises.readFile(fileName).then(buf => buf.toString());
     config = JSON.parse(contents);
   } catch {

src/ts/backend/index.ts

@@ -3,7 +3,7 @@ import {cpuInfo, cpuSpeedUpdate, cpuTemperatureUpdate, cpuUsageUpdate} from "./c
 import {memoryInfo, memoryUsageUpdate} from "./memory";
 import {networkAdapter, networkTransferUpdate, pingUpdate, webUpdate} from "./network";
 import {partitionInfo} from "./disk";
-import {getConfig} from "./config";
+import {getConfig, updateConfig} from "./config";
 import {getAllProcessInfo} from "./process/process";
 
 export default class NodeBackend implements Backend {
@@ -26,4 +26,5 @@ export default class NodeBackend implements Backend {
   processInfo = getAllProcessInfo;
 
   getConfig = async () => getConfig();
+  updateConfig = updateConfig;
 }

src/ts/backend/server/index.ts

@@ -2,10 +2,13 @@ import {Backend} from "../../data/backend";
 import ROUTES from "../../data/routes";
 
 export default function registerBackend(
-  backend: Backend, addRoute: (route: string, result: () => Promise<unknown>) => unknown
+  backend: Backend,
+  addRoute: (route: string, result: () => Promise<unknown>) => unknown,
+  addInputRoute: (route: string, result: (input: unknown) => Promise<unknown>) => unknown,
 ) {
 
   addRoute(ROUTES.CONFIG, backend.getConfig);
+  addInputRoute(ROUTES.UPDATE_CONFIG, backend.updateConfig);
 
   addRoute(ROUTES.CPU_SPEED, backend.cpuSpeedUpdate);
   addRoute(ROUTES.CPU_TEMPERATURE, backend.cpuTemperatureUpdate);

src/ts/backend/server/ipc.ts

@@ -8,5 +8,10 @@ export default function registerIpc(backend: Backend, ipcMain: IpcMain) {
       return JSON.stringify(await f());
     });
   }
-  registerBackend(backend, registerRoute);
+  const registerInputRoute = (route: string, f: (input: unknown) => unknown) => {
+    ipcMain.handle(route, async (_, input) => {
+      return JSON.stringify(await f(JSON.parse(input)));
+    });
+  }
+  registerBackend(backend, registerRoute, registerInputRoute);
 }

src/ts/data/backend.ts

@@ -25,5 +25,6 @@ export interface Backend {
   partitionInfo(): Promise<PartitionInfo[]>;
 
   getConfig(): Promise<Config>;
+  updateConfig(config: Config): Promise<void>;
 
 }

src/ts/data/routes.ts

@@ -1,5 +1,6 @@
 const ROUTES = {
   CONFIG: "/config",
+  UPDATE_CONFIG: "/config/update",
   CPU_SPEED: "/cpu/speed",
   CPU_TEMPERATURE: "/cpu/temperature",
   CPU_USAGE: "/cpu/usage",

src/ts/index.ts

@@ -4,6 +4,7 @@ import index from "../html/index.html";
 import registerIpc from "./backend/server/ipc";
 import NodeBackend from "./backend";
 import startRender from "./renderer";
+import {loadConfig} from "./backend/config";
 
 async function createWindow(): Promise<void> {
   const mainWindow = new BrowserWindow({
@@ -27,6 +28,7 @@ if (process && process.type === 'renderer') {
   startRender().then();
 } else {
   app.on("ready", async () => {
+    await loadConfig();
     registerIpc(new NodeBackend(), ipcMain);
     await createWindow();
   });

src/ts/ui/config/network/interface.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import {ChangeEvent, ReactNode} from "react";
 import {getAllInterfaces, getDefaultInterface} from "../../../backend/network";
-import {getConfig, updateConfig} from "../../../backend/config";
+import {BackendContext} from "../../backendContext";
 
 interface PropType {
   showLabel?: boolean;
@@ -14,6 +14,9 @@ interface StateType {
 
 export default class NetworkInterfaceSettingDropdown extends React.Component<PropType, StateType> {
 
+  static contextType = BackendContext;
+  context!: React.ContextType<typeof BackendContext>;
+
   constructor(props: Readonly<PropType>) {
     super(props);
     this.state = {
@@ -45,10 +48,10 @@ export default class NetworkInterfaceSettingDropdown extends React.Component<Pro
   private onChange = (event: ChangeEvent<HTMLSelectElement>) => {
     const result = event?.target?.value;
     if (result) {
-      const config = getConfig();
+      const config = window.config;
       config.network.interface = result;
-      updateConfig(config)
-        .catch((err) => console.error("Unable to save config!", err));
+      this.context.updateConfig(config)
+        .catch((err: any) => console.error("Unable to save config!", err));
     }
   }
 

src/ts/ui/serverBackend.ts

@@ -1,12 +1,13 @@
 import {Backend} from "../data/backend";
 import ROUTES from "../data/routes";
 import {ipcRenderer} from "electron";
+import {Config} from "../backend/config/interface";
 
 export class ServerBackend implements Backend {
 
-  protected connection: (route: string) => Promise<string>;
+  protected connection: (route: string, input?: string) => Promise<string>;
 
-  constructor(connection: (route: string) => Promise<string>) {
+  constructor(connection: (route: string, input?: string) => Promise<string>) {
     this.connection = connection;
   }
 
@@ -27,12 +28,16 @@ export class ServerBackend implements Backend {
 
   partitionInfo = async () => JSON.parse(await this.connection(ROUTES.DISK_PARTITION_INFO));
   getConfig = async () => JSON.parse(await this.connection(ROUTES.CONFIG));
+  updateConfig = async (config: Config) => {
+    await this.connection(ROUTES.UPDATE_CONFIG, JSON.stringify(config));
+    return;
+  }
 
 }
 
 export class IpcBackend extends ServerBackend implements Backend {
   constructor() {
-    const getResult = (route: string) => ipcRenderer.invoke(route);
+    const getResult = (route: string, input?: string) => ipcRenderer.invoke(route, input);
     super(getResult);
   }
 }

yarn.lock

@@ -529,16 +529,16 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "22.10.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.2.tgz#a485426e6d1fdafc7b0d4c7b24e2c78182ddabb9"
-  integrity sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==
+  version "22.10.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.3.tgz#cdc2a89bf6e5d5e593fad08e83f74d7348d5dd10"
+  integrity sha512-DifAyw4BkrufCILvD3ucnuN8eydUfc/C1GlyrnI+LK6543w5/L3VeVgf05o3B4fqSXP1dKYLOZsKfutpxPzZrw==
   dependencies:
     undici-types "~6.20.0"
 
 "@types/node@^18.11.18":
-  version "18.19.68"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.68.tgz#f4f10d9927a7eaf3568c46a6d739cc0967ccb701"
-  integrity sha512-QGtpFH1vB99ZmTa63K4/FU8twThj4fuVSBkGddTp7uIL/cuoLWIUSL2RcOaigBhfR+hg5pgGkBnkoOxrTVBMKw==
+  version "18.19.69"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.69.tgz#748d301818ba4b238854c53d290257a70aae7d01"
+  integrity sha512-ECPdY1nlaiO/Y6GUnwgtAAhLNaQ53AyIVz+eILxpEo5OvuqE6yWkqWBIb5dU0DqhKQtMeny+FBD3PK6lm7L5xQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -4719,9 +4719,9 @@ symbol-observable@^1.1.0:
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 systeminformation@^5:
-  version "5.23.25"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.23.25.tgz#ca1f0a19c949e40e9909a8f2e94da6246600d27d"
-  integrity sha512-sX/q1AL8gjn+VizKPieuHAiwMyPmM4/oj0mW434sEzwv3m0vghF4aO/VHUvmbMdIa3o5MVFgY9JtvX6M2dL36g==
+  version "5.24.3"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.24.3.tgz#f31ad0253d4595955c7f1bbee738a754c6a19d9b"
+  integrity sha512-f7uvLgsQIj9/gNcbNZWgw27sNJO5tQvi2tCo4/eVlynxS5slaa7EAN2vSD5jh0YljyjE8qQZ3qtAr7EkDCRyMw==
 
 tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"