Improve SettingsManager initial load logic

Jaewoook · Aug 14, 2022 · 602e32a · 602e32a
1 parent 69de80d
commit 602e32a
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/SettingsManager.ts b/src/SettingsManager.ts
@@ -38,22 +38,24 @@ export class SettingsManager<T> {
     settings: T | null = null;
 
     constructor(defaultSettings: T) {
-        (async () => {
-            try {
-                this.settings = await this.loadSettings();
-            } catch (err) {
-                console.error(err);
-                this.settings = defaultSettings;
-                await chrome.storage.local.set(defaultSettings);
-            }
-        })();
+        this.loadSettings().then((settings) => {
+            this.settings = settings;
+        }).catch((err) => {
+            console.error(err);
+            this.settings = defaultSettings;
+            chrome.storage.local.set(defaultSettings);
+        });
     }
 
     get(key: keyof T) {
         return this.settings?.[key];
     }
 
     async loadSettings() {
+        if (!isExtension()) {
+            return null;
+        }
+
         const settings = await chrome.storage.local.get(null);
         if (settings) {
             return settings as T;