Small refact tracker

Author: Stigmatoz

src/compositions/valid-page.ts

@@ -3,9 +3,9 @@ import Browser from 'webextension-polyfill';
 export function isValidPage(tab: Browser.Tabs.Tab | undefined): boolean{
     if (tab == null || tab == undefined || !tab.url || !tab.id) return false;
 
-    if ((tab.url.indexOf('http:') == -1 && tab.url.indexOf('https:') == -1)
-            || tab.url.indexOf('chrome://') !== -1
-            || tab.url.indexOf('chrome-extension://') !== -1)
+    if ((!tab.url.startsWith('http:') && !tab.url.startsWith('https:'))
+            || tab.url.startsWith('chrome://')
+            || tab.url.startsWith('chrome-extension://'))
             return false;
         return true;
 }

src/icons/bmc-new-btn-logo.svg

@@ -4,5 +4,5 @@ import Browser from 'webextension-polyfill';
 export interface ITabsRepository {
     getTabs(): Tab[];
     getTab(domain:string): Tab | undefined;
-    addTab(tab:Browser.Tabs.Tab): Promise<Tab | null>;
+    addTab(domain: string, favicon: string | undefined): Promise<Tab | undefined>;
 }

src/repository/tabs-repository-interface.ts

@@ -1,53 +1,46 @@
 import { ITabsRepository } from "./tabs-repository-interface";
 import { Tab } from "../entity/tab";
-import Browser from 'webextension-polyfill';
 import { injecStorage } from "../storage/inject-storage";
-import { isValidPage } from '../compositions/valid-page';
 import { isInBlackList } from "../compositions/black-list";
-import { extractHostname } from "../compositions/extract-hostname";
 import { StorageDeserializeParam } from "../storage/storage-params";
 
 export class TabsRepository implements ITabsRepository {
-    private tabs: Tab[];
+  private tabs: Tab[];
 
-    constructor() {
-        this.tabs = [];
-    }
-    
-    async initAsync(){
-        this.tabs = await injecStorage().getDeserializeList(StorageDeserializeParam.TABS) as Tab[];
-    }
+  constructor() {
+    this.tabs = [];
+  }
 
-    getTabs(): Tab[] {
-        return this.tabs;
-    }
+  async initAsync() {
+    this.tabs = (await injecStorage().getDeserializeList(
+      StorageDeserializeParam.TABS
+    )) as Tab[];
+  }
 
-    getTab(domain: string): Tab | undefined {
-        return this.tabs?.find(x => x.url === domain);
-    }
+  getTabs(): Tab[] {
+    return this.tabs;
+  }
 
-    async addTab(tab: Browser.Tabs.Tab): Promise<Tab | undefined> {
-        if (isValidPage(tab)) {
-            if (tab.id && (tab.id != 0)) {
-                const domain = extractHostname(tab.url);
-                const tabFromStorage = this.getTab(domain);
-                const isInBlackListFlag = await isInBlackList(domain);
-
-                if (!isInBlackListFlag){
-                    if (!tabFromStorage) {
-                        let favicon = tab.favIconUrl;
-                        if (!favicon) {
-                            favicon = 'chrome://favicon/' + domain;
-                        }
-                        const newTab = new Tab();
-                        newTab.init(domain, favicon);
-                        this.tabs.push(newTab);
-                        return newTab;
-                    }
-                }
-            }
-        }
+  getTab(domain: string): Tab | undefined {
+    return this.tabs?.find((x) => x.url === domain);
+  }
+
+  async addTab(domain: string, favicon: string | undefined): Promise<Tab | undefined> {
+    const tabFromStorage = this.getTab(domain);
+    const isInBlackListFlag = await isInBlackList(domain);
 
-        return undefined;
+    if (!isInBlackListFlag) {
+      if (!tabFromStorage) {
+        if (!favicon) {
+          favicon = "chrome://favicon/" + domain;
+        }
+        const newTab = new Tab();
+        newTab.init(domain, favicon);
+        this.tabs.push(newTab);
+        return newTab;
+      }
     }
-}
+
+    return undefined;
+  }
+}

src/repository/tabs-repository.ts

@@ -39,7 +39,7 @@ async function trackTime(){
             } else {
                 let tab = repo.getTab(activeDomain);
                 if (tab == undefined) {
-                    tab = await repo.addTab(activeTab!);
+                    tab = await repo.addTab(activeDomain, activeTab?.favIconUrl);
                 }
                 if (tab != undefined){
                     const inactivityInterval = (await storage.getValue(