[Refactor] Desktop config store back to class

Comfy-Org · Dec 2, 2024 · ce2d921 · ce2d921
1 parent d1a1d51
commit ce2d921
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/src/main-process/comfyDesktopApp.ts b/src/main-process/comfyDesktopApp.ts
@@ -16,7 +16,7 @@ import { DownloadManager } from '../models/DownloadManager';
 import { VirtualEnvironment } from '../virtualEnvironment';
 import { InstallWizard } from '../install/installWizard';
 import { Terminal } from '../terminal';
-import { useDesktopStore } from '../store/store';
+import { DesktopConfig } from '../store/desktopConfig';
 import { InstallationValidator } from '../install/installationValidator';
 import { restoreCustomNodes } from '../services/backup';
 
@@ -146,7 +146,7 @@ export class ComfyDesktopApp {
     return new Promise<string>((resolve) => {
       ipcMain.on(IPC_CHANNELS.INSTALL_COMFYUI, async (event, installOptions: InstallOptions) => {
         const installWizard = new InstallWizard(installOptions);
-        const { store } = useDesktopStore();
+        const { store } = DesktopConfig;
         store.set('basePath', installWizard.basePath);
 
         await installWizard.install();
@@ -187,7 +187,7 @@ export class ComfyDesktopApp {
         this.appWindow.send(IPC_CHANNELS.LOG_MESSAGE, data);
       },
     });
-    const { store } = useDesktopStore();
+    const { store } = DesktopConfig;
     if (!store.get('Comfy-Desktop.RestoredCustomNodes', false)) {
       try {
         await restoreCustomNodes(virtualEnvironment, this.appWindow);
@@ -205,7 +205,7 @@ export class ComfyDesktopApp {
   }
 
   static async create(appWindow: AppWindow): Promise<ComfyDesktopApp> {
-    const { store } = useDesktopStore();
+    const { store } = DesktopConfig;
     // Migrate settings from old version if required
     const installState = store.get('installState') ?? (await ComfyDesktopApp.migrateInstallState());
 
@@ -228,7 +228,7 @@ export class ComfyDesktopApp {
     const basePath = await ComfyDesktopApp.loadBasePath();
 
     // Migrate config
-    const { store } = useDesktopStore();
+    const { store } = DesktopConfig;
     const upgraded = 'upgraded';
     store.set('installState', upgraded);
     store.set('basePath', basePath);

diff --git a/src/main.ts b/src/main.ts
@@ -9,7 +9,7 @@ import { AppInfoHandlers } from './handlers/appInfoHandlers';
 import { ComfyDesktopApp } from './main-process/comfyDesktopApp';
 import { LevelOption } from 'electron-log';
 import SentryLogging from './services/sentry';
-import { useDesktopStore } from './store/store';
+import { DesktopConfig } from './store/desktopConfig';
 
 dotenv.config();
 log.initialize();
@@ -41,7 +41,7 @@ if (!gotTheLock) {
   app.on('ready', async () => {
     log.debug('App ready');
 
-    const store = await useDesktopStore().loadStore();
+    const store = await DesktopConfig.load();
     if (store) {
       startApp();
     } else {

diff --git a/src/store/store.ts → src/store/desktopConfig.ts b/src/store/store.ts → src/store/desktopConfig.ts
@@ -5,18 +5,22 @@ import path from 'node:path';
 import fs from 'fs/promises';
 import type { DesktopSettings } from '.';
 
-let currentStore: ElectronStore<DesktopSettings>;
-
-/** Generic wrapper class to load electron stores and handle errors. */
-export function useDesktopStore() {
-  const store = currentStore;
+/** Handles loading of electron-store config, pre-window errors, and provides a non-null interface for the store. */
+export class DesktopConfig {
+  static #store: ElectronStore<DesktopSettings> | undefined;
+  static get store(): ElectronStore<DesktopSettings> {
+    const store = this.#store;
+    if (!store) throw new Error('Cannot access store before initialization.');
+    return store;
+  }
 
-  async function loadStore(
+  static async load(
     options?: ConstructorParameters<typeof ElectronStore<DesktopSettings>>[0]
   ): Promise<ElectronStore<DesktopSettings> | undefined> {
     try {
-      currentStore = new ElectronStore<DesktopSettings>(options);
-      return currentStore;
+      DesktopConfig.#store = new ElectronStore<DesktopSettings>(options);
+
+      return DesktopConfig.#store;
     } catch (error) {
       const configFilePath = path.join(getUserDataOrQuit(), `${options?.name ?? 'config'}.json`);
 
@@ -39,7 +43,7 @@ export function useDesktopStore() {
             await tryDeleteConfigFile(configFilePath);
 
             // Causing a stack overflow from this recursion would take immense patience.
-            return loadStore(options);
+            return DesktopConfig.load(options);
           }
         }
 
@@ -52,11 +56,6 @@ export function useDesktopStore() {
       }
     }
   }
-
-  return {
-    store,
-    loadStore,
-  };
 }
 
 function showResetPrompt(configFilePath: string): Promise<Electron.MessageBoxReturnValue> {