fix: chrome notifications not working

Aqours · Aqours · commit 40f13b92b38f · 2026-01-21T20:54:31.000+08:00
- when using fixed notificationId
- it works on firefox
diff --git a/src/scripts/background.ts b/src/scripts/background.ts
@@ -17,7 +17,6 @@ import "./background/weibo-referer.js";
 import { Log } from "./background/log.js";
 import { Utils } from "./sharre/utils.js";
 import { GUID } from "./background/guid.js";
-import { NID_MISMATCH_CORS } from "./sharre/constant.js";
 
 chrome.runtime.onMessage.addListener((message: ServiceWorkerMessage, sender, sendResponse) => {
     if (!message) return;
@@ -32,7 +31,7 @@ chrome.runtime.onMessage.addListener((message: ServiceWorkerMessage, sender, sen
             break;
         }
         case "WithoutCorsMode": {
-            Utils.notify(NID_MISMATCH_CORS, {
+            Utils.notify({
                 title: chrome.i18n.getMessage("warn_title"),
                 message: "当前资源的网络请求不符合 CORS 规范，无法读取资源的数据",
             });
diff --git a/src/scripts/background/context-menu.ts b/src/scripts/background/context-menu.ts
@@ -4,14 +4,7 @@
  * found in the LICENSE file.
  */
 
-import {
-    M_UPLOAD_FRAME,
-    M_BATCH_DELETE,
-    M_UPLOAD_IMAGE,
-    M_OPEN_HISTORY,
-    M_DOWNLOAD_LOG,
-    NID_COPY_URL_FAIL,
-} from "../sharre/constant.js";
+import { M_UPLOAD_FRAME, M_BATCH_DELETE, M_UPLOAD_IMAGE, M_OPEN_HISTORY, M_DOWNLOAD_LOG } from "../sharre/constant.js";
 import { Utils } from "../sharre/utils.js";
 import { Base64 } from "../sharre/base64.js";
 import { PConfig } from "../sharre/constant.js";
@@ -102,7 +95,7 @@ chrome.contextMenus.onClicked.addListener((info, tab) => {
                 },
                 (response) => {
                     if (response && response.valid && !response.done) {
-                        Utils.notify(NID_COPY_URL_FAIL, { message: "操作失败：链接没有复制到剪切板中(lll￢ω￢)" });
+                        Utils.notify({ message: "操作失败：链接没有复制到剪切板中(lll￢ω￢)" });
                     }
                 },
             );
diff --git a/src/scripts/background/events-handler.ts b/src/scripts/background/events-handler.ts
@@ -7,9 +7,9 @@
 import { NID_REMAIN_LOGOUT } from "../sharre/constant.js";
 
 chrome.notifications.onClicked.addListener((notificationId) => {
-    if (notificationId === NID_REMAIN_LOGOUT) {
+    if (notificationId.startsWith(NID_REMAIN_LOGOUT)) {
         const url = `https://weibo.com/login.php?url=${encodeURIComponent("https://weibo.com")}`;
-        chrome.tabs.create({ url }, (tab) => chrome.notifications.clear(NID_REMAIN_LOGOUT));
+        chrome.tabs.create({ url }, (tab) => chrome.notifications.clear(notificationId));
     }
 });
 
diff --git a/src/scripts/history/dispatcher.ts b/src/scripts/history/dispatcher.ts
@@ -24,7 +24,6 @@ export class Dispatcher {
     locked: boolean;
     platformOs: chrome.runtime.PlatformOs;
     maxSelected: number;
-    nid: string;
     head: HTMLElement;
     main: HTMLElement;
     foot: HTMLElement;
@@ -54,7 +53,6 @@ export class Dispatcher {
         this.locked = false;
         this.platformOs = null;
         this.maxSelected = 50;
-        this.nid = Utils.randomString(16);
         this.head = document.querySelector("#head");
         this.main = document.querySelector("#main");
         this.foot = document.querySelector("#foot");
@@ -300,7 +298,7 @@ export class Dispatcher {
                         this.selected.add(section);
                         section.dataset.selected = "true";
                     } else {
-                        Utils.notify(this.nid, { message: `选择失败：最多同时选中${this.maxSelected}个元素` });
+                        Utils.notify({ message: `选择失败：最多同时选中${this.maxSelected}个元素` });
                     }
                 }
             } else {
@@ -358,7 +356,7 @@ export class Dispatcher {
                 this.availableChecker();
             })
             .catch((reason) => {
-                Utils.notify(this.nid, { message: "操作失败：移除文件没有成功哈~" });
+                Utils.notify({ message: "操作失败：移除文件没有成功哈~" });
             });
     }
 
diff --git a/src/scripts/popup/dispatcher.ts b/src/scripts/popup/dispatcher.ts
@@ -29,7 +29,6 @@ export class Dispatcher {
     copier: HTMLTextAreaElement;
     linker: HTMLInputElement;
     checkout: { clear: boolean };
-    nid: string;
     directorySymbol: string;
     classifyMap: Map<Blob, string>;
     preStoreMap: Map<string, IPreStore[]>;
@@ -43,7 +42,6 @@ export class Dispatcher {
         this.copier = document.querySelector("#transfer-to-clipboard");
         this.linker = document.querySelector("input.custom-clip");
         this.checkout = { clear: true };
-        this.nid = Utils.randomString(16);
         this.directorySymbol = "\ud83d\udcc1";
         this.classifyMap = new Map();
         this.preStoreMap = new Map();
@@ -186,7 +184,7 @@ export class Dispatcher {
                         { duration: 500, easing: "ease", fill: "backwards" },
                     );
                 } else {
-                    chrome.notifications.create(this.nid, {
+                    chrome.notifications.create({
                         type: "basic",
                         iconUrl: chrome.i18n.getMessage("notify_icon"),
                         title: chrome.i18n.getMessage("warn_title"),
diff --git a/src/scripts/sharre/fetch-blob.ts b/src/scripts/sharre/fetch-blob.ts
@@ -5,7 +5,7 @@
  */
 
 import { Utils } from "./utils.js";
-import { FP_TYPE_DOWNLOAD, NID_GRAB_RESOURCE } from "./constant.js";
+import { FP_TYPE_DOWNLOAD } from "./constant.js";
 import { Isomorphic } from "./isomorphic.js";
 import { FileProgress } from "./file-progress.js";
 
@@ -31,8 +31,8 @@ export async function fetchBlob(srcUrl: string, pageUrl?: string, _replay = fals
     progress.padding(1);
 
     if (granted && !_replay && Utils.isValidURL(srcUrl) && Utils.isValidURL(pageUrl)) {
-        const DNR_MODIFY_HEADERS = 'modifyHeaders' as chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS;
-        const DNR_SET = 'set' as chrome.declarativeNetRequest.HeaderOperation.SET;
+        const DNR_MODIFY_HEADERS = "modifyHeaders" as chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS;
+        const DNR_SET = "set" as chrome.declarativeNetRequest.HeaderOperation.SET;
         const hostname = new URL(location.href).hostname;
         await chrome.declarativeNetRequest.updateSessionRules({
             addRules: [
@@ -77,7 +77,7 @@ export async function fetchBlob(srcUrl: string, pageUrl?: string, _replay = fals
 
             if (notGranted || grantedAndReplayError) {
                 progress.failure();
-                Utils.notify(NID_GRAB_RESOURCE, {
+                Utils.notify({
                     title: chrome.i18n.getMessage("warn_title"),
                     message: "无法读取远程文件，请开启选项中的伪造 HTTP Referer 功能",
                 });
diff --git a/src/scripts/sharre/utils.ts b/src/scripts/sharre/utils.ts
@@ -481,7 +481,7 @@ export class Utils {
     static notify(arg1: any, arg2?: any, arg3?: any): void {
         if (typeof arg1 === "string") {
             return chrome.notifications.create(
-                arg1,
+                arg1 + "@" + crypto.randomUUID(),
                 Object.assign(
                     {
                         type: "basic",
diff --git a/src/scripts/sharre/weibo-action.ts b/src/scripts/sharre/weibo-action.ts
@@ -11,7 +11,6 @@ import {
     E_FILE_TYPE_RESTRICT,
     FP_TYPE_UPLOAD,
     K_WEIBO_INHERITED_WATERMARK,
-    NID_UPLOAD_RESULT,
 } from "./constant.js";
 
 import { requestUpload } from "../weibo/upload.js";
@@ -147,7 +146,7 @@ export class WeiboUpload {
                     if (this.isNotify) {
                         const { succeed, failure, discard } = await this.progress.getPrevInfo();
                         if (failure || discard) {
-                            chrome.notifications.create(NID_UPLOAD_RESULT, {
+                            chrome.notifications.create({
                                 type: "basic",
                                 iconUrl: chrome.i18n.getMessage("notify_icon"),
                                 title: chrome.i18n.getMessage("warn_title"),
diff --git a/src/scripts/weibo/author.ts b/src/scripts/weibo/author.ts
@@ -12,7 +12,6 @@ import {
     E_MISS_WEIBO_ACCOUNT,
     E_WEIBO_USER_ID_SLIP,
     K_WEIBO_ACCOUNT_DETAILS,
-    NID_LOGIN_RESULT,
     NID_REMAIN_LOGOUT,
 } from "../sharre/constant.js";
 import { tryActivateUserStatus } from "./activator.js";
@@ -81,7 +80,7 @@ async function setUserStatus(notify: boolean): Promise<WB.LoginInfo> {
             return signInByUserAccount(accountInfo.username, accountInfo.password)
                 .catch((reason) => {
                     notify &&
-                        Utils.notify(NID_LOGIN_RESULT, {
+                        Utils.notify({
                             title: chrome.i18n.getMessage("fail_title"),
                             message: "登录失败，请检查微博账户信息及网络情况",
                         });
diff --git a/src/scripts/weibo/upload.ts b/src/scripts/weibo/upload.ts
@@ -14,7 +14,6 @@ import {
     E_FILE_SIZE_RESTRICT,
     E_FILE_SIZE_OVERFLOW,
     UNKNOWN_FILE_SIZE_RESTRICT,
-    NID_LOGIN_RESULT,
 } from "../sharre/constant.js";
 import { attachPhotoToSpecialAlbum } from "./photo.js";
 import { requestSignIn } from "./author.js";
@@ -135,7 +134,7 @@ async function uploader(item: WB.PackedItem, watermark?: WB.Watermark, _replay =
                 return requestSignIn(true)
                     .catch((reason) => {
                         reason.login &&
-                            Utils.notify(NID_LOGIN_RESULT, {
+                            Utils.notify({
                                 title: chrome.i18n.getMessage("fail_title"),
                                 message: "微博登录信息校验成功，可是。。。图片上传失败了呢",
                             });

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ export class Utils {`
`481`	`481`	`static notify(arg1: any, arg2?: any, arg3?: any): void {`
`482`	`482`	`if (typeof arg1 === "string") {`
`483`	`483`	`return chrome.notifications.create(`
`484`		`- arg1,`
	`484`	`+ arg1 + "@" + crypto.randomUUID(),`
`485`	`485`	`Object.assign(`
`486`	`486`	`{`
`487`	`487`	`type: "basic",`