From 653229c8fa1ef748c84c4a5cec756a42f51933ab Mon Sep 17 00:00:00 2001 From: molvqingtai Date: Sun, 13 Oct 2024 06:13:45 +0800 Subject: [PATCH] perf: notification supports clicking to open the source website --- src/app/background/index.ts | 37 ++++++++++++++++++++++++++++-- src/domain/externs/Notification.ts | 4 ---- src/domain/impls/Notification.ts | 6 ++--- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/app/background/index.ts b/src/app/background/index.ts index 7b54c76..aa63d4f 100644 --- a/src/app/background/index.ts +++ b/src/app/background/index.ts @@ -1,14 +1,16 @@ import { EVENT } from '@/constants/event' import { messenger } from '@/messenger' -import { browser } from 'wxt/browser' +import { browser, Tabs } from 'wxt/browser' import { defineBackground } from 'wxt/sandbox' export default defineBackground({ type: 'module', main() { + const historyNotificationTabs = new Map() messenger.onMessage(EVENT.OPTIONS_PAGE_OPEN, () => { browser.runtime.openOptionsPage() }) + messenger.onMessage(EVENT.NOTIFICATION_PUSH, async ({ data: message, sender }) => { // Check if there is an active tab on the same site const tabs = await browser.tabs.query({ active: true }) @@ -17,15 +19,46 @@ export default defineBackground({ }) if (hasActiveSomeSiteTab) return + browser.notifications.create(message.id, { type: 'basic', iconUrl: message.userAvatar, title: message.username, - message: message.body + message: message.body, + contextMessage: sender.tab!.url! }) + historyNotificationTabs.set(message.id, sender.tab!) }) messenger.onMessage(EVENT.NOTIFICATION_CLEAR, async ({ data: id }) => { browser.notifications.clear(id) }) + + browser.notifications.onButtonClicked.addListener(async (id) => { + const fromTab = historyNotificationTabs.get(id) + if (fromTab?.id) { + try { + const tab = await browser.tabs.get(fromTab.id) + browser.tabs.update(tab.id, { active: true }) + } catch { + browser.tabs.create({ url: fromTab.url }) + } + } + }) + + browser.notifications.onClicked.addListener(async (id) => { + const fromTab = historyNotificationTabs.get(id) + if (fromTab?.id) { + try { + const tab = await browser.tabs.get(fromTab.id) + browser.tabs.update(tab.id, { active: true }) + } catch { + browser.tabs.create({ url: fromTab.url }) + } + } + }) + + browser.notifications.onClosed.addListener(async (id) => { + historyNotificationTabs.delete(id) + }) } }) diff --git a/src/domain/externs/Notification.ts b/src/domain/externs/Notification.ts index cf534e4..991116d 100644 --- a/src/domain/externs/Notification.ts +++ b/src/domain/externs/Notification.ts @@ -3,16 +3,12 @@ import { TextMessage } from '../Room' export interface Notification { push: (message: TextMessage) => Promise - clear: (id: string) => Promise } export const NotificationExtern = Remesh.extern({ default: { push: () => { throw new Error('"push" not implemented.') - }, - clear: () => { - throw new Error('"clear" not implemented.') } } }) diff --git a/src/domain/impls/Notification.ts b/src/domain/impls/Notification.ts index 38a66e7..a8f5177 100644 --- a/src/domain/impls/Notification.ts +++ b/src/domain/impls/Notification.ts @@ -4,14 +4,12 @@ import { EVENT } from '@/constants/event' import { messenger } from '@/messenger' class Notification { + messages: TextMessage[] = [] async push(message: TextMessage) { await messenger.sendMessage(EVENT.NOTIFICATION_PUSH, message) + this.messages.push(message) return message.id } - async clear(id: string) { - await messenger.sendMessage(EVENT.NOTIFICATION_CLEAR, id) - return true - } } export const NotificationImpl = NotificationExtern.impl(new Notification())