Merge pull request #2018 from candela97/refactor-runtime.onMessage-li…

…stener Return a promise from the `runtime.onMessage` listener
IsThereAnyDeal · Aug 24, 2024 · 1086250 · 1086250
2 parents 75f9765 + 8929fa2
commit 1086250
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/js/Background/background.ts b/src/js/Background/background.ts
@@ -41,9 +41,8 @@ browser.runtime.onInstalled.addListener(async (detail) => {
 
 browser.runtime.onMessage.addListener((
     message: Message,
-    sender: MessageSender,
-    sendResponse: (...params: any) => void
-): true|undefined => {
+    sender: MessageSender
+): undefined|Promise<any> => {
 
     if (!sender || !sender.tab) { // not from a tab, ignore
         return;
@@ -52,12 +51,12 @@ browser.runtime.onMessage.addListener((
         return;
     }
 
-    (async function(): Promise<void> {
+    return (async () => {
         try {
             await Promise.all([IndexedDB.init(), SettingsStore.init()]);
 
             let response: any = undefined;
-            let handlers: MessageHandlerInterface[] = [
+            const handlers: MessageHandlerInterface[] = [
                 new AugmentedSteamApi(),
                 new SteamCommunityApi(),
                 new InventoryApi(),
@@ -67,18 +66,18 @@ browser.runtime.onMessage.addListener((
                 new CacheApi()
             ];
 
-            for (let handler of handlers) {
+            for (const handler of handlers) {
                 response = await handler.handle(message);
                 if (response !== Unrecognized) {
                     break;
                 }
             }
 
             if (response === Unrecognized) {
-                throw new Error(`Did not recognize message`);
+                throw new Error("Unknown message");
             }
 
-            sendResponse(response);
+            return response;
         } catch (err) {
             console.group(`Callback: "${message.action}"`);
             console.error("Failed to execute %o", message);
@@ -88,8 +87,6 @@ browser.runtime.onMessage.addListener((
             throw new Error((<Error>err).toString());
         }
     })();
-
-    return true;
 });
 
 ContextMenu.register();
diff --git a/src/js/Content/Modules/AugmentedSteam.ts b/src/js/Content/Modules/AugmentedSteam.ts
@@ -194,10 +194,9 @@ export default class AugmentedSteam {
 
     static init() {
         document.addEventListener("asRequestError", e => {
-            // @ts-ignore
-            const name = e.detail.name ?? null;
-            // @ts-ignore
-            const message = e.detail.message ?? null;
+            const {detail} = e as CustomEvent;
+            const name = detail.name ?? null;
+            const message = detail.message ?? null;
 
             if (name === "LoginError" && message !== null) {
                 this.addLoginWarning(message);