1 files changed, 17 insertions, 6 deletions

diff --git a/packages/main/src/infrastructure/config/impl/ConfigFile.ts b/packages/main/src/infrastructure/config/impl/ConfigFile.ts
index 4f0d4f0..8f0cc3f 100644
--- a/packages/main/src/infrastructure/config/impl/ConfigFile.ts
+++ b/packages/main/src/infrastructure/config/impl/ConfigFile.ts
@@ -22,7 +22,7 @@ import { watch } from 'node:fs';
 import { readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
-import { throttle } from 'lodash-es';
+import { debounce } from 'lodash-es';
 
 import type Disposer from '../../../utils/Disposer.js';
 import getLogger from '../../../utils/getLogger.js';
@@ -33,6 +33,7 @@ import type { ReadConfigResult } from '../ConfigRepository.js';
 const log = getLogger('ConfigFile');
 
 export const CONFIG_FILE_NAME = 'settings.json';
+export const DEFAULT_CONFIG_CHANGE_DEBOUNCE_MS = 10;
 
 export default class ConfigFile implements ConfigRepository {
   private readonly configFilePath: string;
@@ -44,6 +45,7 @@ export default class ConfigFile implements ConfigRepository {
   constructor(
     private readonly userDataDir: string,
     private readonly configFileName = CONFIG_FILE_NAME,
+    private readonly debounceTime = DEFAULT_CONFIG_CHANGE_DEBOUNCE_MS,
   ) {
     this.configFilePath = path.join(userDataDir, configFileName);
   }
@@ -59,7 +61,7 @@ export default class ConfigFile implements ConfigRepository {
       }
       throw error;
     }
-    log.info('Read config file', this.configFilePath);
+    log.debug('Read config file', this.configFilePath);
     return {
       found: true,
       contents,
@@ -82,10 +84,10 @@ export default class ConfigFile implements ConfigRepository {
     log.debug('Wrote config file', this.configFilePath);
   }
 
-  watchConfig(callback: () => Promise<void>, throttleMs: number): Disposer {
+  watchConfig(callback: () => Promise<void>): Disposer {
     log.debug('Installing watcher for', this.userDataDir);
 
-    const configChanged = throttle(async () => {
+    const configChanged = debounce(async () => {
       let mtime: Date;
       try {
         const stats = await stat(this.configFilePath);
@@ -116,9 +118,13 @@ export default class ConfigFile implements ConfigRepository {
           'which is newer than last written',
           this.timeLastWritten,
         );
-        await callback();
+        try {
+          await callback();
+        } catch (error) {
+          log.error('Callback error while listening for config changes', error);
+        }
       }
-    }, throttleMs);
+    }, this.debounceTime);
 
     const watcher = watch(
       this.userDataDir,
@@ -127,8 +133,12 @@ export default class ConfigFile implements ConfigRepository {
         recursive: false,
       },
       (_eventType, filename) => {
+        // We handle both `rename` and `change` events for maximum portability.
+        // This may result in multiple calls to `configChanged` for a single config change,
+        // so we debounce it with a short (imperceptible) delay.
         if (filename === this.configFileName || filename === null) {
           configChanged()?.catch((err) => {
+            // This should never happen, because `configChanged` handles all exceptions.
             log.error(
               'Unhandled error while listening for config changes',
               err,
@@ -141,6 +151,7 @@ export default class ConfigFile implements ConfigRepository {
     return () => {
       log.trace('Removing watcher for', this.configFilePath);
       watcher.close();
+      configChanged.cancel();
     };
   }
 }