fix: avoid console errors

tolgee · Dec 22, 2023 · 9efb5b3 · 9efb5b3
1 parent 7795ad4
commit 9efb5b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/src/background/background.ts b/src/background/background.ts
@@ -9,14 +9,15 @@ chrome.runtime.onMessage.addListener(({ type, data }, sender, sendResponse) => {
       ScreenshotMaker.capture(sender.tab!.windowId).then((data) => {
         sendResponse(data);
       });
-      // this indicates, that we send response asynchronously
       return true;
     case 'TOLGEE_SET_STATE':
       setStateIcon(data, sender.tab!.id!);
-      return false;
+      sendResponse();
+      break;
     default:
-      return false;
+      sendResponse();
   }
+  return false;
 });
 
 const setStateIcon = (state: State, tabId: number) => {

diff --git a/src/content/Messages.ts b/src/content/Messages.ts
@@ -3,10 +3,7 @@ type Listener = {
   callback: (data) => void;
 };
 
-type RuntimeCallbackType = (
-  data,
-  responseCallback: (response?) => void
-) => void;
+type RuntimeCallbackType = (data) => Promise<any>;
 
 type RuntimeListener = {
   type: string;
@@ -28,7 +25,6 @@ export class Messages {
 
   readonly startWindowListening = () => {
     const receiveMessage = (event: PgEvent) => {
-      console.log(event.data);
       if (event.source !== window) {
         return;
       }
@@ -47,11 +43,12 @@ export class Messages {
     // noinspection JSDeprecatedSymbols
     chrome.runtime.onMessage.addListener(
       (request: RuntimeMessage, sender, sendResponse) => {
-        this.listenersRuntime.forEach((listener) => {
+        this.listenersRuntime.forEach(async (listener) => {
           if (listener.type == request.type) {
-            listener.callback(request.data, sendResponse);
+            sendResponse(await listener.callback(request.data));
           }
         });
+        return true;
       }
     );
   };
@@ -69,7 +66,6 @@ export class Messages {
   };
 
   readonly sendToPlugin = (type: string, data?: any) => {
-    console.log({ type, data });
     return new Promise((resolve) => {
       chrome.runtime.sendMessage({ type, data }, (data) => resolve(data));
     });

diff --git a/src/content/contentScript.ts b/src/content/contentScript.ts
@@ -53,18 +53,15 @@ messages.listenWindow('TOLGEE_TAKE_SCREENSHOT', () => {
 messages.startRuntimeListening();
 
 // popup will ask if tolgee is present on the page
-messages.listenRuntime('DETECT_TOLGEE', (data, sendResponse) => {
-  sendResponse();
+messages.listenRuntime('DETECT_TOLGEE', async () => {
   if (configuration) {
     messages.sendToPlugin('TOLGEE_CONFIG_LOADED', configuration);
   }
 });
 
-messages.listenRuntime('GET_CREDENTIALS', (data, sendResponse) =>
-  sendResponse(getAppliedCredenials())
-);
+messages.listenRuntime('GET_CREDENTIALS', async () => getAppliedCredenials());
 
-messages.listenRuntime('SET_CREDENTIALS', (data, sendResponse) => {
+messages.listenRuntime('SET_CREDENTIALS', async (data) => {
   if (data.apiKey) {
     sessionStorage.setItem(API_KEY_LOCAL_STORAGE, data.apiKey);
   } else {
@@ -76,6 +73,5 @@ messages.listenRuntime('SET_CREDENTIALS', (data, sendResponse) => {
     sessionStorage.removeItem(API_URL_LOCAL_STORAGE);
   }
   location.reload();
-  sendResponse(true);
   updateState(configuration, messages);
 });