fix: return generic in executeScript

Author: Savecoders

src/services/browser.adapter.ts

@@ -1,6 +1,6 @@
 interface BrowserAdapter<T> {
   getBrowserTab(): Promise<T>;
-  executeScript(callback: () => void): Promise<void>;
+  executeScript<R>(callback: () => Promise<R>): Promise<R>;
 }
 
 export default BrowserAdapter;

src/services/chome.service.ts

@@ -23,12 +23,21 @@ class ChromeService implements AdapterBrowser<chrome.tabs.Tab> {
     return this.currentTab;
   }
 
-  async executeScript(callback: () => void): Promise<void> {
+  async executeScript<R>(callback: () => Promise<R>): Promise<R> {
     const tab = await this.getBrowserTab();
-    chrome.scripting.executeScript({
-      target: { tabId: tab.id! },
-      func: callback,
-    });
+
+    return chrome.scripting
+      .executeScript({
+        target: { tabId: tab.id! },
+        func: callback,
+      })
+      .then(injectionResults =>
+        injectionResults.length ? (injectionResults[0].result as R) : <R>null,
+      )
+      .catch(error => {
+        console.error(error);
+        return <R>null;
+      });
   }
 }
 

src/services/firefox.service.ts

@@ -1,30 +1,48 @@
 import AdapterBrowser from './browser.adapter';
 
 class FirefoxService implements AdapterBrowser<browser.tabs.Tab> {
-  private tab?: browser.tabs.Tab;
+  private currentTab?: browser.tabs.Tab;
 
   constructor() {}
 
-  async getBrowserTab(): Promise<browser.tabs.Tab> {
-    const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+  private async getActiveTab(): Promise<browser.tabs.Tab> {
+    const tabs = await new Promise<browser.tabs.Tab[]>(() => {
+      browser.tabs.query({ active: true, currentWindow: true });
+    });
     if (tabs.length) {
       return tabs[0];
     } else {
       throw new Error('No active tab found');
     }
   }
 
-  async getTab(): Promise<browser.tabs.Tab> {
-    return this.getBrowserTab();
+  async getBrowserTab(): Promise<browser.tabs.Tab> {
+    if (!this.currentTab) {
+      this.currentTab = await this.getActiveTab();
+    }
+    return this.currentTab;
   }
 
-  async executeScript(callback: () => void): Promise<void> {
-    if (!this.tab) {
-      this.tab = await this.getBrowserTab();
-    }
-    await browser.scripting.executeScript({
-      target: { tabId: this.tab.id! },
-      func: callback,
+  async executeScript<R>(callback: () => Promise<R>): Promise<R> {
+    const tab = await this.getBrowserTab();
+    return new Promise<R>((resolve, reject) => {
+      browser.scripting
+        .executeScript({
+          target: { tabId: tab.id! },
+          func: () => {
+            try {
+              const result = callback();
+              if (result instanceof Promise) {
+                result.then(resolve).catch(reject);
+              } else {
+                resolve(result);
+              }
+            } catch (error) {
+              reject(error);
+            }
+          },
+        })
+        .then(() => {});
     });
   }
 }