Skip to content

兼容FF: chrome.scripting.registerContentScripts #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodFrm merged 1 commit into from
Sep 2, 2025
Merged

兼容FF: chrome.scripting.registerContentScripts #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/app/service/service_worker/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,19 +502,21 @@ export class RuntimeService {
}
}

const list: chrome.userScripts.RegisteredUserScript[] = [];
const res = {} as {
content: chrome.scripting.RegisteredContentScript;
inject: chrome.userScripts.RegisteredUserScript | null;
};

// content.js
list[0] = {
const script: chrome.scripting.RegisteredContentScript = {
id: "scriptcat-content",
js: [{ file: "src/content.js" }],
js: ["src/content.js"],
matches: ["<all_urls>"],
allFrames: true,
runAt: "document_start",
world: "USER_SCRIPT",
excludeMatches,
excludeGlobs,
};
res.content = script;

// inject.js
const injectJs = await this.injectJsCodePromise;
Expand All @@ -523,10 +525,10 @@ export class RuntimeService {
excludeMatches,
excludeGlobs,
});
list.push(script);
res.inject = script;
}

return list;
return res;
}

async registerUserscripts() {
Expand Down Expand Up @@ -555,7 +557,15 @@ export class RuntimeService {
this.getContentAndInjectScript(),
]);

const list = [...particularScriptList, ...generalScriptList];
const list = [...particularScriptList, generalScriptList.inject!];

// 注册 content.js
const contentScript: chrome.scripting.RegisteredContentScript = generalScriptList.content;
try {
await chrome.scripting.registerContentScripts([contentScript]);
} catch (e: any) {
this.logger.error("register content.js error", Logger.E(e));
}

try {
await chrome.userScripts.register(list);
Expand Down