ajax/bilibili-subtitle
1
0
Fork 0
Code Pull Requests Releases Activity

优化

Browse Source
This commit is contained in:
IndieKKY
2024-10-06 18:41:12 +08:00
parent 3e1e69f13e
commit 02aaba6a83
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chrome/background.ts
View File

@@ -115,7 +115,7 @@ chrome.action.onClicked.addListener(async (tab) => {
}) })
} else { } else {
closeSidePanel() closeSidePanel()
extensionMessaging.broadcastMessageExact([tab.id!], [TAG_TARGET_INJECT], MESSAGE_TO_INJECT_TOGGLE_DISPLAY).catch(console.error) extensionMessaging.broadcastMessageExact([tab.id!], [TAG_TARGET_INJECT], 'TOGGLE_DISPLAY').catch(console.error)
} }
}) })
}) })

8
src/messaging/layer2/ExtensionMessaging.ts
View File

@@ -45,7 +45,7 @@ class ExtensionMessaging<M extends ExtensionMessage> {
portContext.ready = true portContext.ready = true
}, },
ROUTE: async (params, context: MethodContext) => { ROUTE: async (params, context: MethodContext) => {
return this.broadcastMessageExact([context.tabId!], params.tags, params.method, params.params) return this.broadcastMessageExact([context.tabId!], params.tags, params.method as any, params.params)
}, },
} }
@@ -98,7 +98,7 @@ class ExtensionMessaging<M extends ExtensionMessage> {
//tags 如果为null，则不检查tags，如果为空数组，则不会发送消息 //tags 如果为null，则不检查tags，如果为空数组，则不会发送消息
//返回：最后一个响应(因此如果只发送给一个tab，则返回的是该tab的响应) //返回：最后一个响应(因此如果只发送给一个tab，则返回的是该tab的响应)
broadcastMessageExact = async (tabIds: number[], tags: string[] | null, method: string, params?: any) => { broadcastMessageExact = async <M extends AllInjectMessages | AllAPPMessages, K extends M['method']>(tabIds: number[], tags: string[] | null, method: K, params?: Extract<M, { method: K }>['params']): Promise<Extract<M, { method: K }>['return']> => {
// 如果tags为空数组，则不会发送消息 // 如果tags为空数组，则不会发送消息
if (tags != null && tags.length === 0) { if (tags != null && tags.length === 0) {
return return
@@ -121,13 +121,13 @@ class ExtensionMessaging<M extends ExtensionMessage> {
return res?.data return res?.data
} }
broadcastMessage = async (ignoreTabIds: number[] | undefined | null, tags: string[], method: string, params?: any) => { broadcastMessage = async <M extends AllInjectMessages | AllAPPMessages, K extends M['method']>(ignoreTabIds: number[] | undefined | null, tags: string[], method: K, params?: Extract<M, { method: K }>['params']): Promise<Extract<M, { method: K }>['return']> => {
const tabs = await chrome.tabs.query({ const tabs = await chrome.tabs.query({
discarded: false, discarded: false,
}) })
const tabIds: number[] = tabs.map(tab => tab.id).filter(tabId => tabId != null) as number[] const tabIds: number[] = tabs.map(tab => tab.id).filter(tabId => tabId != null) as number[]
const filteredTabIds: number[] = tabIds.filter(tabId => !ignoreTabIds?.includes(tabId)) const filteredTabIds: number[] = tabIds.filter(tabId => !ignoreTabIds?.includes(tabId))
await this.broadcastMessageExact(filteredTabIds, tags, method, params) return await this.broadcastMessageExact(filteredTabIds, tags, method, params)
} }
} }