Skip to content

#6141 Fix isServiceWorker check #6143

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

Closed
sosnovsky wants to merge 1 commit into from
Closed

#6141 Fix isServiceWorker check #6143

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions extension/js/common/browser/browser-msg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ export class BrowserMsg {
private static async sendAwait(destString: string | undefined, name: string, bm?: Dict<unknown>, awaitRes = false): Promise<Bm.Response> {
bm = bm || {};
// console.debug(`sendAwait ${name} to ${destString || 'bg'}`, bm);
const isBackgroundPage = await Env.isBackgroundPage();
if (isBackgroundPage && BrowserMsg.HANDLERS_REGISTERED_BACKGROUND && typeof destString === 'undefined') {
const isServiceWorker = await Env.isServiceWorker();
if (isServiceWorker && BrowserMsg.HANDLERS_REGISTERED_BACKGROUND && typeof destString === 'undefined') {
// calling from bg script to bg script: skip messaging
const handler: Bm.AsyncRespondingHandler = BrowserMsg.HANDLERS_REGISTERED_BACKGROUND[name];
return await handler(bm);
Expand All @@ -647,7 +647,7 @@ export class BrowserMsg {
stack: CatchHelper.stackTrace(),
};
// eslint-disable-next-line no-null/no-null
if (!(await Env.isBackgroundPage()) && msg.to !== null) {
if (!(await Env.isServiceWorker()) && msg.to !== null) {
const validMsg: Bm.RawWithWindowExtensions = { ...msg, to: msg.to };
// send via window messaging in parallel
Catch.try(async () => {
Expand Down Expand Up @@ -695,9 +695,9 @@ export class BrowserMsg {
};
try {
if (chrome.runtime) {
Env.isBackgroundPage()
.then(isBackgroundPage => {
if (isBackgroundPage) {
Env.isServiceWorker()
.then(isServiceWorker => {
if (isServiceWorker) {
chrome.tabs.query({ active: true, currentWindow: true }, tabs => {
for (const tab of tabs) {
chrome.tabs.sendMessage(Number(tab.id), msg, resolve);
Expand Down
2 changes: 1 addition & 1 deletion extension/js/common/browser/chrome.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type ChromeStorageType = 'local' | 'session';

const handleFatalErr = async (reason: 'storage_undefined', error: Error) => {
try {
if (await Env.isBackgroundPage()) {
if (await Env.isServiceWorker()) {
throw error;
} else if (Env.isContentScript()) {
console.error('Incomplete extension environment in content script', error);
Expand Down
4 changes: 2 additions & 2 deletions extension/js/common/browser/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ export class Env {
}

// Check if the current context is a Service Worker
public static async isBackgroundPage() {
public static async isServiceWorker() {
// In firefox, window&document is not null even in background page
if (typeof browser !== 'undefined' && typeof browser.runtime?.getBackgroundPage !== 'undefined') {
const backgroundPage = await browser.runtime.getBackgroundPage();
return backgroundPage === window;
}
return typeof window === 'undefined' && typeof document === 'undefined';
return typeof window === 'undefined' && typeof importScripts === 'function';
}

public static isExtension() {
Expand Down
Loading
Loading