refactor: Get rid of dependency injector

3 files changed, 22 insertions, 75 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?.();
-  }
 }
diff --git a/packages/main/src/controllers/MainController.ts b/packages/main/src/controllers/MainController.ts
deleted file mode 100644
index 6b97330..0000000
--- a/packages/main/src/controllers/MainController.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import type { ConfigController } from './ConfigController';
-import type { NativeThemeController } from './NativeThemeController';
-import type { MainStore } from '../stores/MainStore';
-
-export class MainController {
-  static inject = ['configController', 'nativeThemeController'] as const;
-
-  constructor(
-    private readonly configController: ConfigController,
-    private readonly nativeThemeController: NativeThemeController,
-  ) {
-  }
-
-  async connect(store: MainStore): Promise<void> {
-    await this.configController.initConfig(store.config);
-    this.nativeThemeController.connect(store);
-  }
-}
diff --git a/packages/main/src/controllers/NativeThemeController.ts b/packages/main/src/controllers/NativeThemeController.ts
index a50d41e..931660c 100644
--- a/packages/main/src/controllers/NativeThemeController.ts
+++ b/packages/main/src/controllers/NativeThemeController.ts
@@ -20,30 +20,23 @@
 
 import { nativeTheme } from 'electron';
 import { autorun } from 'mobx';
-import { IDisposer } from 'mobx-state-tree';
 
 import type { MainStore } from '../stores/MainStore';
+import { DisposeHelper } from '../utils';
 
-export class NativeThemeController {
-  private autorunDisposer: IDisposer | null = null;
-
-  private shouldUseDarkColorsListener: (() => void) | null = null;
-
+export class NativeThemeController extends DisposeHelper {
   connect(store: MainStore): void {
-    this.autorunDisposer = autorun(() => {
+    this.registerDisposable(autorun(() => {
       nativeTheme.themeSource = store.config.themeSource;
-    });
+    }));
+
     store.setShouldUseDarkColors(nativeTheme.shouldUseDarkColors);
-    this.shouldUseDarkColorsListener = () => {
+    const shouldUseDarkColorsListener = () => {
       store.setShouldUseDarkColors(nativeTheme.shouldUseDarkColors);
     };
-    nativeTheme.on('updated', this.shouldUseDarkColorsListener);
-  }
-
-  dispose(): void {
-    if (this.shouldUseDarkColorsListener !== null) {
-      nativeTheme.off('updated', this.shouldUseDarkColorsListener);
-    }
-    this.autorunDisposer?.();
+    nativeTheme.on('updated', shouldUseDarkColorsListener);
+    this.registerDisposable(() => {
+      nativeTheme.off('updated', shouldUseDarkColorsListener);
+    });
   }
 }