1 files changed, 12 insertions, 20 deletions

diff --git a/packages/main/src/controllers/ConfigController.ts b/packages/main/src/controllers/ConfigController.ts
index a28746c..318506f 100644
--- a/packages/main/src/controllers/ConfigController.ts
+++ b/packages/main/src/controllers/ConfigController.ts
@@ -19,34 +19,30 @@
  */
 
 import { debounce } from 'lodash';
-import {
-  applySnapshot,
-  getSnapshot,
-  IDisposer,
-  onSnapshot,
-} from 'mobx-state-tree';
+import ms from 'ms';
+import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree';
 
 import type { ConfigPersistenceService } from '../services/ConfigPersistenceService';
 import type { Config, ConfigSnapshotOut } from '../stores/Config';
+import { DisposeHelper } from '../utils';
 
-export class ConfigController {
-  static inject = ['configPersistenceService', 'configDebounceTime'] as const;
+const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s');
 
+export class ConfigController extends DisposeHelper {
   private config: Config | null = null;
 
-  private onSnapshotDisposer: IDisposer | null = null;
-
   private lastSnapshotOnDisk: ConfigSnapshotOut | null = null;
 
   private writingConfig: boolean = false;
 
   constructor(
     private readonly persistenceService: ConfigPersistenceService,
-    private readonly debounceTime: number,
+    private readonly debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME,
   ) {
+    super();
   }
 
-  async initConfig(config: Config): Promise<void> {
+  async connect(config: Config): Promise<void> {
     this.config = config;
 
     const foundConfig: boolean = await this.readConfig();
@@ -59,20 +55,20 @@ export class ConfigController {
       }
     }
 
-    this.onSnapshotDisposer = onSnapshot(this.config, debounce((snapshot) => {
+    this.registerDisposable(onSnapshot(this.config, debounce((snapshot) => {
       // We can compare snapshots by reference, since it is only recreated on store changes.
       if (this.lastSnapshotOnDisk !== snapshot) {
         this.writeConfig().catch((err) => {
           console.log('Failed to write config on config change', err);
         })
       }
-    }, this.debounceTime));
+    }, this.debounceTime)));
 
-    this.persistenceService.watchConfig(async () => {
+    this.registerDisposable(this.persistenceService.watchConfig(async () => {
       if (!this.writingConfig) {
         await this.readConfig();
       }
-    }, this.debounceTime);
+    }, this.debounceTime));
   }
 
   private async readConfig(): Promise<boolean> {
@@ -100,8 +96,4 @@ export class ConfigController {
       this.writingConfig = false;
     }
   }
-
-  dispose(): void {
-    this.onSnapshotDisposer?.();
-  }
 }