Skip to content

globalThis instead of window #41

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

globalThis instead of window #41

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 src/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export interface FetchEventSourceInit extends RequestInit {
*/
openWhenHidden?: boolean;

/** The Fetch function to use. Defaults to window.fetch */
/** The Fetch function to use. Defaults to globalThis.fetch */
fetch?: typeof fetch;
}

Expand Down Expand Up @@ -84,10 +84,10 @@ export function fetchEventSource(input: RequestInfo, {
}

let retryInterval = DefaultRetryInterval;
let retryTimer = 0;
let retryTimer: number = 0;
function dispose() {
document.removeEventListener('visibilitychange', onVisibilityChange);
window.clearTimeout(retryTimer);
globalThis.clearTimeout(retryTimer);
curRequestController.abort();
}

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

const fetch = inputFetch ?? window.fetch;
const fetch = inputFetch ?? globalThis.fetch;
const onopen = inputOnOpen ?? defaultOnOpen;
async function create() {
curRequestController = new AbortController();
Expand Down Expand Up @@ -131,8 +131,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);
globalThis.clearTimeout(retryTimer);
retryTimer = globalThis.setTimeout(create, interval) as unknown as number;
} catch (innerErr) {
// we should not retry anymore:
dispose();
Expand Down