returns from listener to align to type from chrome, asserts message t…

…ype in listener (#1434)

@shared/api/helpers/extensionMessaging.ts

@@ -74,7 +74,7 @@ export const sendMessageToBackground = async (msg: Msg): Promise<Response> => {
     res = (await browser.runtime.sendMessage(msg)) as Response;
   }
 
-  return res;
+  return res as Response;
 };
 
 export const FreighterApiNodeError = {

extension/src/background/helpers/dataStorageAccess.ts

@@ -6,7 +6,7 @@ export interface SetItemParams {
 
 // https://github.com/mozilla/webextension-polyfill/issues/424
 interface BrowserStorage extends browser.Storage.Static {
-  session: browser.Storage.LocalStorageArea;
+  session: browser.Storage.StorageArea;
 }
 
 const storage = browser.storage as BrowserStorage;

extension/src/background/helpers/message.ts

@@ -0,0 +1,13 @@
+import { ExternalRequest, Response } from "@shared/api/types";
+
+export const isResponse = (
+  message: ExternalRequest | Response,
+): message is Response => {
+  return "messagedId" in message;
+};
+
+export const isExternalMessage = (
+  message: ExternalRequest | Response,
+): message is ExternalRequest => {
+  return !("messagedId" in message);
+};

extension/src/background/index.ts

@@ -16,6 +16,8 @@ import {
   migrateSorobanRpcUrlNetworkDetails,
   versionedMigration,
 } from "./helpers/dataStorage";
+import { ExternalRequest, Response } from "@shared/api/types";
+import { isExternalMessage, isResponse } from "./helpers/message";
 
 export const initContentScriptMessageListener = () => {
   browser?.runtime?.onMessage?.addListener((message) => {
@@ -24,25 +26,30 @@ export const initContentScriptMessageListener = () => {
         file: "contentScript.min.js",
       });
     }
+    return undefined;
   });
 };
 
 export const initExtensionMessageListener = () => {
   browser?.runtime?.onMessage?.addListener(async (request, sender) => {
     const sessionStore = await buildStore();
     // todo this is kinda ugly
+    const req = request as ExternalRequest | Response;
     let res;
-    if (Object.values(SERVICE_TYPES).includes(request.type as SERVICE_TYPES)) {
+    if (isResponse(req) && Object.values(SERVICE_TYPES).includes(req.type)) {
       // eslint-disable-next-line
-      res = await popupMessageListener(request, sessionStore);
+      res = await popupMessageListener(req, sessionStore);
     }
     if (
-      Object.values(EXTERNAL_SERVICE_TYPES).includes(
-        request.type as EXTERNAL_SERVICE_TYPES,
-      )
+      isExternalMessage(req) &&
+      Object.values(EXTERNAL_SERVICE_TYPES).includes(req.type)
     ) {
       // eslint-disable-next-line
-      res = await freighterApiMessageListener(request, sender, sessionStore);
+      res = await freighterApiMessageListener(
+        req as ExternalRequest,
+        sender,
+        sessionStore,
+      );
     }
 
     return res;