消息通信优化

src/chrome/background.ts

@@ -1,10 +1,7 @@
 import {v4} from 'uuid'
 import {handleTask, initTaskService, tasksMap} from './taskService'
-import {MESSAGE_TARGET_EXTENSION, MESSAGE_TO_EXTENSION_ADD_TASK, MESSAGE_TO_EXTENSION_GET_TASK} from '@/const'
-
-const debug = (...args: any[]) => {
-  console.debug('[Extension]', ...args)
-}
+import {MESSAGE_TO_EXTENSION_ADD_TASK, MESSAGE_TO_EXTENSION_GET_TASK} from '@/const'
+import ExtensionMessage from '@/messaging/ExtensionMessage'
 
 const methods: {
   [key: string]: (params: any, context: MethodContext) => Promise<any>
@@ -46,12 +43,12 @@ const methods: {
     }
   },
 }
+// 初始化backgroundMessage
+const extensionMessage = new ExtensionMessage()
+extensionMessage.init(methods)
 
-/**
- * Note: Return true when sending a response asynchronously.
- */
 chrome.runtime.onMessage.addListener((event: MessageData, sender: chrome.runtime.MessageSender, sendResponse: (result: any) => void) => {
-  debug((sender.tab != null) ? `tab ${sender.tab.url ?? ''} => ` : 'extension => ', event)
+  // debug((sender.tab != null) ? `tab ${sender.tab.url ?? ''} => ` : 'extension => ', event)
 
   // legacy
   if (event.type === 'syncGet') { // sync.get
@@ -66,44 +63,6 @@ chrome.runtime.onMessage.addListener((event: MessageData, sender: chrome.runtime
     chrome.storage.sync.remove(event.keys).catch(console.error)
     return
   }
-
-  // check event target
-  if (event.target !== MESSAGE_TARGET_EXTENSION) return
-
-  const method = methods[event.method]
-  if (method != null) {
-    method(event.params, {
-      event,
-      sender,
-    }).then(data => sendResponse({
-      success: true,
-      code: 200,
-      data,
-    })).catch(err => {
-      console.error(err)
-      let message
-      if (err instanceof Error) {
-        message = err.message
-      } else if (typeof err === 'string') {
-        message = err
-      } else {
-        message = 'error: ' + JSON.stringify(err)
-      }
-      sendResponse({
-        success: false,
-        code: 500,
-        message,
-      })
-    })
-    return true
-  } else {
-    console.error('Unknown method:', event.method)
-    sendResponse({
-      success: false,
-      code: 501,
-      message: 'Unknown method: ' + event.method,
-    })
-  }
 })
 
 initTaskService()

src/chrome/backgroundUtil.ts

@@ -1,14 +0,0 @@
-export const broadcastMessage = async (ignoreTabIds: number[] | undefined | null, target: string, method: string, params?: any) => {
-  const tabs = await chrome.tabs.query({
-    discarded: false,
-  })
-  for (const tab of tabs) {
-    try {
-      if (tab.id && ((ignoreTabIds == null) || !ignoreTabIds.includes(tab.id))) {
-        await chrome.tabs.sendMessage(tab.id, {target, method, params})
-      }
-    } catch (e) {
-      console.error('send message to tab error', tab.id, e)
-    }
-  }
-}