Skip to content

Fix WebSocket race condition by adding readyState check before send() #46

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
susnux merged 2 commits into from
Oct 22, 2025
Merged

Fix WebSocket race condition by adding readyState check before send() #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d16376
Fix WebSocket race condition by adding readyState check before send()
benjaminfrueh Sep 23, 2025
fa363d2
Add a flag to track if notify_push is ready instead of relying on the…
benjaminfrueh Sep 24, 2025
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
8 changes: 7 additions & 1 deletion lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ declare global {
_notify_push_online: boolean,
_notify_push_available: boolean,
_notify_push_error_count: number,
_notify_push_ready: boolean,
}
}

Expand Down Expand Up @@ -57,7 +58,7 @@ export function listen(name: string, handler: (string, any) => void, options: No
}

window._notify_push_listeners[name].push(handler);
if (window._notify_push_ws !== null && typeof window._notify_push_ws === "object") {
if (window._notify_push_ws !== null && typeof window._notify_push_ws === "object" && window._notify_push_ready) {
window._notify_push_ws.send('listen ' + name);
} else {
setupSocket(options);
Expand All @@ -73,10 +74,12 @@ function setupGlobals(options: NotifyPushOptions = {}) {
window._notify_push_online = true;
window._notify_push_available = false;
window._notify_push_error_count = 0;
window._notify_push_ready = false;

subscribe('networkOffline', () => {
window._notify_push_online = false;
window._notify_push_ws = null;
window._notify_push_ready = false;
});
subscribe('networkOnline', () => {
window._notify_push_error_count = 0;
Expand Down Expand Up @@ -127,6 +130,8 @@ async function setupSocket(options: NotifyPushOptions = {}) {
window._notify_push_ws.send(options.credentials.password)
}

window._notify_push_ready = true;

for (let name in window._notify_push_listeners) {
window._notify_push_ws.send('listen ' + name);
}
Expand Down Expand Up @@ -154,6 +159,7 @@ async function setupSocket(options: NotifyPushOptions = {}) {
window._notify_push_ws.onerror = window._notify_push_ws.onclose = () => {
window._notify_push_ws = null;
window._notify_push_error_count += 1;
window._notify_push_ready = false;

setTimeout(() => {
if (window._notify_push_online) {
Expand Down