Skip to content
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

Jump to bottom

Use self instead of window. This ensures compatibility with background script in manifest v3 #71

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use self instead of window. This ensures compatibility with background script in manifest v3 #71

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02379fa
Use self instead of window. This ensures compatibility with backgroun…
AkashKarnatak Jan 17, 2024
dc62c89
Create visibilitychange listener only when document is defined
AkashKarnatak Apr 13, 2024
d341cff
Fixed logical error
AkashKarnatak Apr 13, 2024
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
14 changes: 9 additions & 5 deletions src/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ export function fetchEventSource(input: RequestInfo, {
...rest
}: FetchEventSourceInit) {
return new Promise<void>((resolve, reject) => {
// set openWhenHidden to true when document is not defined
openWhenHidden ||= !self.document
// make a copy of the input headers since we may modify it below:
const headers = { ...inputHeaders };
if (!headers.accept) {
Expand All @@ -86,8 +88,10 @@ export function fetchEventSource(input: RequestInfo, {
let retryInterval = DefaultRetryInterval;
let retryTimer = 0;
function dispose() {
document.removeEventListener('visibilitychange', onVisibilityChange);
window.clearTimeout(retryTimer);
if (!openWhenHidden) {
document.removeEventListener('visibilitychange', onVisibilityChange);
}
self.clearTimeout(retryTimer);
curRequestController.abort();
}

Expand All @@ -97,7 +101,7 @@ export function fetchEventSource(input: RequestInfo, {
resolve(); // don't waste time constructing/logging errors
});

const fetch = inputFetch ?? window.fetch;
const fetch = inputFetch ?? self.fetch;
const onopen = inputOnOpen ?? defaultOnOpen;
async function create() {
curRequestController = new AbortController();
Expand Down Expand Up @@ -131,8 +135,8 @@ export function fetchEventSource(input: RequestInfo, {
try {
// check if we need to retry:
const interval: any = onerror?.(err) ?? retryInterval;
window.clearTimeout(retryTimer);
retryTimer = window.setTimeout(create, interval);
self.clearTimeout(retryTimer);
retryTimer = self.setTimeout(create, interval);
} catch (innerErr) {
// we should not retry anymore:
dispose();
Expand Down