1 files changed, 28 insertions, 16 deletions

diff --git a/packages/main/src/infrastructure/config/impl/ConfigFile.ts b/packages/main/src/infrastructure/config/impl/ConfigFile.ts
index 684a827..4f0d4f0 100644
--- a/packages/main/src/infrastructure/config/impl/ConfigFile.ts
+++ b/packages/main/src/infrastructure/config/impl/ConfigFile.ts
@@ -32,6 +32,8 @@ import type { ReadConfigResult } from '../ConfigRepository.js';
 
 const log = getLogger('ConfigFile');
 
+export const CONFIG_FILE_NAME = 'settings.json';
+
 export default class ConfigFile implements ConfigRepository {
   private readonly configFilePath: string;
 
@@ -41,7 +43,7 @@ export default class ConfigFile implements ConfigRepository {
 
   constructor(
     private readonly userDataDir: string,
-    private readonly configFileName = 'settings.json',
+    private readonly configFileName = CONFIG_FILE_NAME,
   ) {
     this.configFilePath = path.join(userDataDir, configFileName);
   }
@@ -65,6 +67,9 @@ export default class ConfigFile implements ConfigRepository {
   }
 
   async writeConfig(contents: string): Promise<void> {
+    if (this.writingConfig) {
+      throw new Error('writeConfig cannot be called reentrantly');
+    }
     this.writingConfig = true;
     try {
       await writeFile(this.configFilePath, contents, 'utf8');
@@ -95,7 +100,11 @@ export default class ConfigFile implements ConfigRepository {
           );
           return;
         }
-        throw error;
+        log.error(
+          'Unexpected error while listening for config file changes',
+          error,
+        );
+        return;
       }
       if (
         !this.writingConfig &&
@@ -111,20 +120,23 @@ export default class ConfigFile implements ConfigRepository {
       }
     }, throttleMs);
 
-    const watcher = watch(this.userDataDir, {
-      persistent: false,
-    });
-
-    watcher.on('change', (eventType, filename) => {
-      if (
-        eventType === 'change' &&
-        (filename === this.configFileName || filename === null)
-      ) {
-        configChanged()?.catch((err) => {
-          log.error('Unhandled error while listening for config changes', err);
-        });
-      }
-    });
+    const watcher = watch(
+      this.userDataDir,
+      {
+        persistent: false,
+        recursive: false,
+      },
+      (_eventType, filename) => {
+        if (filename === this.configFileName || filename === null) {
+          configChanged()?.catch((err) => {
+            log.error(
+              'Unhandled error while listening for config changes',
+              err,
+            );
+          });
+        }
+      },
+    );
 
     return () => {
       log.trace('Removing watcher for', this.configFilePath);