fix sendmessage warnings

yaozhiwang · Apr 28, 2023 · 2faf264 · 2faf264
1 parent d6996c6
commit 2faf264
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -99,7 +99,11 @@ chrome.runtime.onConnect.addListener((port) => {
   }
 })
 
-chrome.runtime.onMessage.addListener(async function (msg, sender) {
+chrome.runtime.onMessage.addListener(async function (
+  msg,
+  sender,
+  sendResponse
+) {
   if (msg.name == MessageNames.UpdateActionIcon) {
     const { pageEnabled, hostEnabled } = msg.enabledDetails
 
@@ -116,5 +120,6 @@ chrome.runtime.onMessage.addListener(async function (msg, sender) {
     }
   } else if (msg.name === MessageNames.FixChatGPTWebAppAuthState) {
     await chatGPTWebAppClient.fixAuthState()
+    sendResponse()
   }
 })
diff --git a/src/contents/chatgpt-inpage-proxy.ts b/src/contents/chatgpt-inpage-proxy.ts
@@ -16,11 +16,13 @@ function injectTip() {
 }
 
 async function main() {
-  chrome.runtime.onMessage.addListener(async (message) => {
-    if (message === "url") {
-      return location.href
+  chrome.runtime.onMessage.addListener(
+    async (message, sender, sendResponse) => {
+      if (message === MessageNames.QueryUrl) {
+        sendResponse(location.href)
+      }
     }
-  })
+  )
   if ((window as any).__NEXT_DATA__) {
     await chrome.runtime.sendMessage({ name: MessageNames.ProxyTabReady })
     injectTip()

diff --git a/src/messaging.ts b/src/messaging.ts
@@ -6,7 +6,8 @@ export enum MessageNames {
   ProxyResponseMetadata = "proxy-response-metadata",
   ProxyResponseBodyChunk = "proxy-response-body-chunk",
   ProxyTabReady = "proxy-tab-ready",
-  FixChatGPTWebAppAuthState = "fix-chatgpt-webapp-auth-state"
+  FixChatGPTWebAppAuthState = "fix-chatgpt-webapp-auth-state",
+  QueryUrl = "query-url"
 }
 
 export enum PortNames {

diff --git a/src/provider/chatgpt-webapp/requesters.ts b/src/provider/chatgpt-webapp/requesters.ts
@@ -20,7 +20,9 @@ class ProxyFetchRequester implements Requester {
         if (tab.url) {
           return tab.url
         }
-        return chrome.tabs.sendMessage(tab.id!, "url").catch(() => undefined)
+        return chrome.tabs
+          .sendMessage(tab.id!, MessageNames.QueryUrl)
+          .catch(() => undefined)
       })
     )
     for (let i = 0; i < results.length; i++) {
@@ -33,10 +35,12 @@ class ProxyFetchRequester implements Requester {
   waitForProxyTabReady(onReady: (tab: chrome.tabs.Tab) => void) {
     chrome.runtime.onMessage.addListener(async function listener(
       message,
-      sender
+      sender,
+      sendResponse
     ) {
       if (message.name === MessageNames.ProxyTabReady) {
         chrome.runtime.onMessage.removeListener(listener)
+        sendResponse()
         onReady(sender.tab!)
       }
     })