1 files changed, 11 insertions, 106 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index 8055ce2..8297ff5 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -26,20 +26,9 @@ import {
   nativeTheme,
 } from 'electron';
 import { readFileSync } from 'fs';
-import {
-  readFile,
-  stat,
-  watch,
-  writeFile,
-} from 'fs/promises';
-import JSON5 from 'json5';
+import { readFile } from 'fs/promises';
 import { autorun } from 'mobx';
-import {
-  applySnapshot,
-  getSnapshot,
-  onPatch,
-  onSnapshot,
-} from 'mobx-state-tree';
+import { getSnapshot, onPatch } from 'mobx-state-tree';
 import { join } from 'path';
 import {
   ServiceToMainIpcMessage,
@@ -58,8 +47,8 @@ import {
   installDevToolsExtensions,
   openDevToolsWhenReady,
 } from './devTools';
-import { ConfigSnapshotOut } from './stores/Config';
-import { createRootStore } from './stores/RootStore';
+import { ConfigPersistenceImpl } from './services/impl/ConfigPersistenceImpl';
+import { createMainStore } from './stores/MainStore';
 
 const isDevelopment = import.meta.env.MODE === 'development';
 
@@ -116,7 +105,12 @@ if (isDevelopment) {
 
 let mainWindow: BrowserWindow | null = null;
 
-const store = createRootStore();
+const store = createMainStore({
+  configPersistence: new ConfigPersistenceImpl(
+    app.getPath('userData'),
+    'config.json5',
+  ),
+});
 
 autorun(() => {
   nativeTheme.themeSource = store.config.themeSource;
@@ -127,96 +121,7 @@ nativeTheme.on('updated', () => {
   store.setShouldUseDarkColors(nativeTheme.shouldUseDarkColors);
 });
 
-const userDataDir = app.getPath('userData');
-const configFileName = 'config.json5';
-const configPath = join(userDataDir, configFileName);
-let loadingConfig = false;
-let savingConfig = false;
-let configMtime: Date | null = null;
-
-async function loadConfig(): Promise<void> {
-  let configStr: string;
-  try {
-    configStr = await readFile(configPath, 'utf8');
-  } catch (err) {
-    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-      console.log('Creating config', configPath);
-      return saveConfig(getSnapshot(store.config));
-    }
-    throw err;
-  }
-  let configSnapshot: unknown;
-  try {
-    configSnapshot = JSON5.parse(configStr);
-  } catch (err) {
-    console.error('Invalid config file', configPath, err);
-    return;
-  }
-  loadingConfig = true;
-  try {
-    applySnapshot(store.config, configSnapshot);
-  } catch (err) {
-    console.error('Falied to apply snaphot', configPath, configSnapshot, err);
-  } finally {
-    loadingConfig = false;
-  }
-}
-
-async function saveConfig(configSnapshot: ConfigSnapshotOut): Promise<void> {
-  const configJson = JSON5.stringify(configSnapshot, {
-    space: 2,
-  });
-  savingConfig = true;
-  try {
-    await writeFile(configPath, configJson, 'utf8');
-    const stats = await stat(configPath);
-    configMtime = stats.mtime;
-  } finally {
-    savingConfig = false;
-  }
-  console.log('Wrote config', configPath);
-}
-
-onSnapshot(store.config, (snapshot) => {
-  if (!loadingConfig) {
-    saveConfig(snapshot).catch((err) => {
-      console.error('Failed to save config', configPath, err);
-    });
-  }
-});
-
-async function watchConfig(): Promise<void> {
-  const configWatcher = watch(userDataDir, {
-    persistent: false,
-  });
-  for await (const { eventType, filename } of configWatcher) {
-    if (eventType !== 'change'
-      && (filename !== configFileName || filename !== null)) {
-      continue;
-    }
-    let mtime: Date;
-    try {
-      const stats = await stat(configPath);
-      mtime = stats.mtime;
-    } catch (err) {
-      if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-        continue;
-      }
-      throw err;
-    }
-    if (!savingConfig && (configMtime === null || mtime > configMtime)) {
-      await loadConfig();
-      configMtime = mtime;
-      console.log('Reloaded config', configPath);
-    }
-  }
-}
-
-loadConfig().catch((err) => {
-  console.error('Failed to load config', configPath, err);
-}).then(watchConfig).catch((err) => {
-  console.error('Error when watching for config changes', configPath, err);
-});
+store.config.initConfig();
 
 const rendererBaseUrl = getResourceUrl('../renderer/');
 function shouldCancelMainWindowRequest(url: string, method: string): boolean {