1 files changed, 41 insertions, 32 deletions

diff --git a/packages/main/src/reactions/synchronizeConfig.ts b/packages/main/src/reactions/synchronizeConfig.ts
index 9436c16..6044ee7 100644
--- a/packages/main/src/reactions/synchronizeConfig.ts
+++ b/packages/main/src/reactions/synchronizeConfig.ts
@@ -18,51 +18,56 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import deepEqual from 'deep-equal';
 import { debounce } from 'lodash-es';
 import { reaction } from 'mobx';
-import ms from 'ms';
 
-import type ConfigRepository from '../infrastructure/config/ConfigRepository';
-import type SharedStore from '../stores/SharedStore';
-import type Config from '../stores/config/Config';
-import type Disposer from '../utils/Disposer';
-import { getLogger } from '../utils/log';
+import type ConfigRepository from '../infrastructure/config/ConfigRepository.js';
+import type SharedStore from '../stores/SharedStore.js';
+import type Config from '../stores/config/Config.js';
+import type Disposer from '../utils/Disposer.js';
+import getLogger from '../utils/getLogger.js';
 
-const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s');
+const DEFAULT_CONFIG_DEBOUNCE_TIME_MS = 1000;
 
 const log = getLogger('synchronizeConfig');
 
+export function serializeConfig(config: Config): string {
+  return `${JSON.stringify(config, undefined, 2)}\n`;
+}
+
 export default async function synchronizeConfig(
   sharedStore: SharedStore,
   repository: ConfigRepository,
-  debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME,
+  debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME_MS,
 ): Promise<Disposer> {
-  let lastConfigOnDisk: Config | undefined;
+  let lastConfigOnDisk: string | undefined;
 
-  async function writeConfig(): Promise<void> {
-    const { config } = sharedStore;
-    await repository.writeConfig(config);
-    lastConfigOnDisk = config;
+  async function writeConfig(serializedConfig: string): Promise<void> {
+    await repository.writeConfig(serializedConfig);
+    lastConfigOnDisk = serializedConfig;
   }
 
   async function readConfig(): Promise<boolean> {
     const result = await repository.readConfig();
     if (result.found) {
+      const { contents } = result;
+      if (contents === lastConfigOnDisk) {
+        // No need to re-apply config if we have already applied it.
+        return true;
+      }
       try {
         // This cast is unsound if the config file is invalid,
         // but we'll throw an error in the end anyways.
-        sharedStore.loadConfig(result.data as Config);
+        const data = JSON.parse(contents) as Config;
+        sharedStore.loadConfig(data);
+        log.info('Loaded config');
       } catch (error) {
-        log.error('Failed to apply config snapshot', result.data, error);
+        log.error('Failed to apply config snapshot', contents, error);
         return true;
       }
-      lastConfigOnDisk = sharedStore.config;
-      // We can't use `comparer.structural` from `mobx`, because
-      // it handles missing values and `undefined` values differently,
-      // but JSON5 is unable to distinguish them.
-      if (!deepEqual(result.data, lastConfigOnDisk, { strict: true })) {
-        await writeConfig();
+      lastConfigOnDisk = serializeConfig(sharedStore.config);
+      if (contents !== lastConfigOnDisk) {
+        await writeConfig(lastConfigOnDisk);
       }
     }
     return result.found;
@@ -70,20 +75,23 @@ export default async function synchronizeConfig(
 
   if (!(await readConfig())) {
     log.info('Config file was not found');
-    await writeConfig();
+    const serializedConfig = serializeConfig(sharedStore.config);
+    await writeConfig(serializedConfig);
     log.info('Created config file');
   }
 
+  const debouncedSerializeConfig = debounce(() => {
+    const serializedConfig = serializeConfig(sharedStore.config);
+    if (serializedConfig !== lastConfigOnDisk) {
+      writeConfig(serializedConfig).catch((error) => {
+        log.error('Failed to write config on config change', error);
+      });
+    }
+  }, debounceTime);
+
   const disposeReaction = reaction(
     () => sharedStore.config,
-    debounce((config) => {
-      // We can compare snapshots by reference, since it is only recreated on store changes.
-      if (!deepEqual(config, lastConfigOnDisk, { strict: true })) {
-        writeConfig().catch((error) => {
-          log.error('Failed to write config on config change', error);
-        });
-      }
-    }, debounceTime),
+    debouncedSerializeConfig,
   );
 
   const disposeWatcher = repository.watchConfig(async () => {
@@ -92,10 +100,11 @@ export default async function synchronizeConfig(
     } catch (error) {
       log.error('Failed to read config', error);
     }
-  }, debounceTime);
+  });
 
   return () => {
     disposeWatcher();
     disposeReaction();
+    debouncedSerializeConfig.flush();
   };
 }