Change store for current active tab

Author: Stigmatoz

src/compositions/activeTab.ts

@@ -0,0 +1,26 @@
+export class ActiveTab {
+  private static instance: ActiveTab;
+  private _activeTab: string | null;
+
+  constructor() {
+      if (ActiveTab.instance) {
+          throw new Error("Error - use ActiveTab.getInstance()");
+      }
+      this._activeTab = null;
+  }
+
+  static getInstance(): ActiveTab {
+    ActiveTab.instance = ActiveTab.instance || new ActiveTab();
+    return ActiveTab.instance;
+  }
+
+  public setActiveTab(value:string | null): void
+  {
+    this._activeTab = value;
+  }
+
+  public getActiveTab(): string | null
+  {
+    return this._activeTab;
+  }
+}

src/repository/tabs-repository.ts

@@ -6,23 +6,22 @@ import { isValidPage } from '../compositions/valid-page';
 import { isInBlackList } from "../compositions/black-list";
 import { extractHostname } from "../compositions/extract-hostname";
 import { addInterval, closeInterval } from "../compositions/daily-intervals";
+import { ActiveTab } from "../compositions/activeTab"
 
 export class TabsRepository implements ITabsRepository {
     private tabs: Tab[];
-    private currentTabDomain: string | null;
+    private activeTab = ActiveTab.getInstance();
 
     constructor() {
         this.tabs = [];
-        this.currentTabDomain = null;
     }
 
     async initAsync(){
         this.tabs = await injecStorage().getTabs();
     }
 
     getTab(domain: string): Tab | undefined {
-        const tab = this.tabs?.find(x => x.url === domain);
-        return !tab ? tab : undefined;
+        return this.tabs?.find(x => x.url === domain);
     }
 
     async addTab(tab: Browser.Tabs.Tab): Promise<void> {
@@ -42,17 +41,17 @@ export class TabsRepository implements ITabsRepository {
                     }
                     else {
                         tabFromStorage.incCounter();
-                        if (this.currentTabDomain != domain) this.setCurrentActiveTab(domain);
-                        await closeInterval(this.currentTabDomain);
-                        await addInterval(this.currentTabDomain);
+                        if (this.activeTab.getActiveTab() != domain) this.setCurrentActiveTab(domain);
+                        await closeInterval(this.activeTab.getActiveTab());
+                        await addInterval(this.activeTab.getActiveTab());
                     }
                 }
-                else await closeInterval(this.currentTabDomain);
+                else await closeInterval(this.activeTab.getActiveTab());
             }
-        } else await closeInterval(this.currentTabDomain);
+        } else await closeInterval(this.activeTab.getActiveTab());
     }
 
     private setCurrentActiveTab(domain:string){
-        this.currentTabDomain = domain;
+        this.activeTab.setActiveTab(domain);
     }
 }