Merge pull request #5 from kungfux/feature/apply_settings_in_runtime

Apply settings in runtime

Author: kungfux

src/background/service-worker.ts renamed to src/background/background-service.ts

@@ -1,19 +1,16 @@
 import type { Tabs, WebNavigation } from 'webextension-polyfill';
 import { tabs, webNavigation, scripting } from 'webextension-polyfill';
+import { Settings } from '../settings';
 
-export class ServiceWorker {
-  private readonly urls: string[];
-  private readonly urlRegexs: RegExp[];
-
-  public constructor(urls: string[]) {
-    this.urls = urls;
-    this.urlRegexs = [];
-    for (const url of this.urls) {
-      this.urlRegexs.push(new RegExp(url, 'i'));
-    }
-  }
+export class BackgroundService {
+  private readonly settings = new Settings();
+  private urlRegexs: RegExp[] = [];
 
   public init(): void {
+    void this.getUrlsToListen();
+    this.settings.onChanged(() => {
+      void this.getUrlsToListen();
+    });
     tabs.onUpdated.addListener((tabId, changeInfo, tabInfo) => {
       void this.onTabUpdated(tabId, changeInfo, tabInfo);
     });
@@ -22,7 +19,7 @@ export class ServiceWorker {
     });
   }
 
-  public async onTabUpdated(
+  private async onTabUpdated(
     tabId: number,
     changeInfo: Tabs.OnUpdatedChangeInfoType,
     tabInfo: Tabs.Tab
@@ -32,14 +29,22 @@ export class ServiceWorker {
     }
   }
 
-  public async onNavigationCompleted(
+  private async onNavigationCompleted(
     details: WebNavigation.OnCompletedDetailsType
   ): Promise<void> {
     if (details.url.length > 0 && this.isJiraUrl(details.url)) {
       await this.injectContentScript(details.tabId);
     }
   }
 
+  private async getUrlsToListen(): Promise<void> {
+    const { urls } = await this.settings.getSettings();
+    this.urlRegexs = [];
+    for (const url of urls) {
+      this.urlRegexs.push(new RegExp(url, 'i'));
+    }
+  }
+
   private isJiraUrl(url: string): boolean {
     for (const x of this.urlRegexs) {
       if (x.test(url)) {

src/background/index.ts

@@ -1,12 +1,8 @@
 import { runtime } from 'webextension-polyfill';
-import { Settings } from '../settings';
-import { ServiceWorker } from './service-worker';
+import { BackgroundService } from './background-service';
 
-runtime.onInstalled.addListener((details) => {
+new BackgroundService().init();
+
+runtime.onInstalled.addListener(() => {
   void runtime.openOptionsPage();
 });
-
-const settings = new Settings();
-const s = await settings.getSettings();
-const serviceWorker = new ServiceWorker(s.urls);
-serviceWorker.init();

src/content/index.ts

@@ -11,5 +11,5 @@ declare global {
     return;
   }
   window.hasRun = true;
-  new IssueExpert().print();
+  new IssueExpert().init();
 })();

src/content/issue-expert.ts

@@ -1,5 +1,12 @@
+import { Settings } from '../settings';
+
 export class IssueExpert {
-  print(): void {
-    console.log('Hello there');
+  private readonly settings = new Settings();
+
+  init(): void {
+    console.log('Injected!');
+    this.settings.onChanged(() => {
+      console.log('Settings changed');
+    });
   }
 }

src/settings.ts

@@ -18,4 +18,12 @@ export class Settings {
       urls: settings.urls,
     });
   }
+
+  public onChanged(callback: () => void): void {
+    if (!storage.onChanged.hasListener(callback)) {
+      storage.onChanged.addListener(() => {
+        callback();
+      });
+    }
+  }
 }