Fix error for loading on popup

Author: Stigmatoz

src/repository/inject-tabs-repository.ts

@@ -9,9 +9,13 @@ async function createAndInitInstance() {
   return repo;
 }
 
-export async function injectTabsRepository(): Promise<ITabsRepository> {
+export async function injectTabsRepositorySingleton(): Promise<ITabsRepository> {
   if (instanse == null) {
     instanse = await createAndInitInstance();
   }
   return instanse;
 }
+
+export async function injectTabsRepository(): Promise<ITabsRepository> {
+  return createAndInitInstance();
+}

src/repository/tabs-repository.ts

@@ -1,9 +1,9 @@
-import { ITabsRepository } from "./tabs-repository-interface";
-import { Tab } from "../entity/tab";
-import { injecStorage } from "../storage/inject-storage";
-import { isInBlackList } from "../compositions/black-list";
-import { StorageDeserializeParam } from "../storage/storage-params";
-import { todayLocalDate } from "../utils/today";
+import { ITabsRepository } from './tabs-repository-interface';
+import { Tab } from '../entity/tab';
+import { injecStorage } from '../storage/inject-storage';
+import { isInBlackList } from '../compositions/black-list';
+import { StorageDeserializeParam } from '../storage/storage-params';
+import { todayLocalDate } from '../utils/today';
 
 export class TabsRepository implements ITabsRepository {
   private tabs: Tab[];
@@ -13,32 +13,30 @@ export class TabsRepository implements ITabsRepository {
   }
 
   async initAsync() {
-    this.tabs = (await injecStorage().getDeserializeList(
-      StorageDeserializeParam.TABS
-    )) as Tab[];
+    this.tabs = (await injecStorage().getDeserializeList(StorageDeserializeParam.TABS)) as Tab[];
   }
 
   getTabs(): Tab[] {
     return this.tabs;
   }
 
-  getTodayTabs(): Tab[]{
+  getTodayTabs(): Tab[] {
     return this.tabs.filter(x => x.days.find(s => s.date === todayLocalDate()));
   }
 
   getTab(domain: string): Tab | undefined {
-    return this.tabs?.find((x) => x.url === domain);
+    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);
 
     if (!isInBlackListFlag && !tabFromStorage) {
-        const newTab = new Tab();
-        newTab.init(domain);
-        this.tabs.push(newTab);
-        return newTab;
+      const newTab = new Tab();
+      newTab.init(domain);
+      this.tabs.push(newTab);
+      return newTab;
     }
 
     return undefined;

src/tracker.ts

@@ -1,7 +1,7 @@
 import Browser from 'webextension-polyfill';
 import { isValidPage } from './compositions/valid-page';
 import { extractHostname } from './compositions/extract-hostname';
-import { injectTabsRepository } from './repository/inject-tabs-repository';
+import { injectTabsRepositorySingleton } from './repository/inject-tabs-repository';
 import { isInBlackList } from './compositions/black-list';
 import { useBadge } from './compositions/set-badge';
 import {
@@ -28,7 +28,7 @@ export async function initTracker() {
 }
 
 async function trackTime() {
-  const repo = await injectTabsRepository();
+  const repo = await injectTabsRepositorySingleton();
   const window = await Browser.windows.getLastFocused({ populate: true });
   if (window.focused) {
     const activeTab = window.tabs?.find(t => t.active === true);
@@ -118,7 +118,7 @@ async function mainTracker(
 
 async function saveTabs() {
   const storage = injecStorage();
-  const repo = await injectTabsRepository();
+  const repo = await injectTabsRepositorySingleton();
   const tabs = repo.getTabs();
   await storage.saveTabs(tabs);
 }