fix: broken communication with background

Author: L-a-r-t

options/index.tsx

@@ -18,81 +18,85 @@ import {
 // API calls that can be made from content scripts transit trough the background script
 // This is done to prevent CORS errors
 // Functions here aren't decoupled from the background script because of odd behavior with sendResponse
-chrome.runtime.onMessageExternal.addListener(
-  (message, sender, sendResponse) => {
-    switch (message.type) {
-      case "chatgpt-to-notion_search":
-        searchNotion(message.body.query)
-          .then((res) => {
-            sendResponse(res)
-          })
-          .catch((err) => {
-            console.error(err)
-            sendResponse({ err })
-          })
-        break
-      case "chatgpt-to-notion_checkSaveConflict":
-        checkSaveConflict(message.body)
-          .then((res) => {
-            sendResponse(res)
-          })
-          .catch((err) => {
-            console.error(err)
-            sendResponse({ err })
-          })
-        break
-      case "chatgpt-to-notion_saveChat":
-        saveChat(message.body)
-          .then((res) => {
-            sendResponse(res)
-          })
-          .catch((err) => {
-            console.error(err)
-            sendResponse({ err })
-          })
-        break
-      case "chatgpt-to-notion_autoSave":
-        const storage = new Storage()
-        saveChat(message.body)
-          .then((res) => {
-            sendResponse(res)
-            storage.set("autosaveStatus", "saved" as AutosaveStatus)
-          })
-          .catch((err) => {
-            storage.set("autosaveStatus", "error" as AutosaveStatus)
-            console.error(err)
-            sendResponse({ err })
-          })
-        break
-      case "chatgpt-to-notion_generateToken":
-        // using two means of checking if user is logged in just to be sure
-        const session = new Storage({
-          area: "session",
-          secretKeyList: ["token"]
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+  switch (message.type) {
+    case "chatgpt-to-notion_search":
+      searchNotion(message.body.query)
+        .then((res) => {
+          sendResponse(res)
         })
-        session.get("token").then((token) => {
-          if (token) return
-          generateToken(message.body.code).then((res) => {
-            sendResponse(res)
-          })
+        .catch((err) => {
+          console.error(err)
+          sendResponse({ err })
         })
-        break
-      case "chatgpt-to-notion_getDB":
-        getDatabase(message.body.id)
+      break
+    case "chatgpt-to-notion_checkSaveConflict":
+      checkSaveConflict(message.body)
+        .then((res) => {
+          sendResponse(res)
+        })
+        .catch((err) => {
+          console.error(err)
+          sendResponse({ err })
+        })
+      break
+    case "chatgpt-to-notion_saveChat":
+      saveChat(message.body)
+        .then((res) => {
+          sendResponse(res)
+        })
+        .catch((err) => {
+          console.error(err)
+          sendResponse({ err })
+        })
+      break
+    case "chatgpt-to-notion_autoSave":
+      const storage = new Storage()
+      saveChat(message.body)
+        .then((res) => {
+          sendResponse(res)
+          storage.set("autosaveStatus", "saved" as AutosaveStatus)
+        })
+        .catch((err) => {
+          storage.set("autosaveStatus", "error" as AutosaveStatus)
+          console.error(err)
+          sendResponse({ err })
+        })
+      break
+    case "chatgpt-to-notion_generateToken":
+      // using two means of checking if user is logged in just to be sure
+      const session = new Storage({
+        area: "session",
+        secretKeyList: ["token"]
+      })
+      session.get("token").then((token) => {
+        if (token) return
+        generateToken(message.body.code)
           .then((res) => {
+            console.log(res)
             sendResponse(res)
           })
           .catch((err) => {
             console.error(err)
             sendResponse({ err })
           })
-        break
-      default:
-        return true
-    }
-    return true
+      })
+      break
+    case "chatgpt-to-notion_getDB":
+      getDatabase(message.body.id)
+        .then((res) => {
+          sendResponse(res)
+        })
+        .catch((err) => {
+          console.error(err)
+          sendResponse({ err })
+        })
+      break
+    default:
+      return true
   }
-)
+  return true
+})
 
 chrome.runtime.onInstalled.addListener(() => {
   refreshContentScripts()

src/background/index.ts

@@ -5,7 +5,8 @@ export const config: PlasmoContentScript = {
 }
 
 chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-  if (message.type === "fetchFullChat") sendResponse(fetchFullChat())
+  if (message.type === "chatgpt-to-notion_fetchFullChat")
+    sendResponse(fetchFullChat())
 })
 
 const fetchFullChat = () => {

src/contents/fetchFullPage.ts

@@ -47,7 +47,7 @@ function ErrorPopup() {
       if (!config) return
       setLoading(true)
       await chrome.runtime.sendMessage({
-        type: "triggerAutosave",
+        type: "chatgpt-to-notion_triggerAutosave",
         body: {
           chatID,
           config

src/popup/ErrorPopup.tsx

@@ -134,7 +134,7 @@ function IndexPopup() {
         answers: string[]
         url: string
       } = await chrome.tabs.sendMessage(currentTab.id, {
-        type: "fetchFullChat"
+        type: "chatgpt-to-notion_fetchFullChat"
       })
       const req = {
         ...chat,