Skip to content

Fix console warning including 'undefined' and a type violation #235

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
wants to merge 2 commits into from
Closed

Fix console warning including 'undefined' and a type violation #235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e3435
fix: console warning printing "Max reconnect attempts of undefined ex…
michaelboyles May 3, 2024
4e53741
refactor: extract common function for reconnecting
michaelboyles May 3, 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
59 changes: 29 additions & 30 deletions src/lib/attach-listener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,16 @@ const bindCloseHandler = (
return () => {};
}
assertIsWebSocket(webSocketInstance, optionsRef.current.skipAssert);
let reconnectTimeout: number;
let reconnectTimeout: number | undefined;

webSocketInstance.onclose = (event: WebSocketEventMap['close']) => {
optionsRef.current.onClose && optionsRef.current.onClose(event);
setReadyState(ReadyState.CLOSED);
if (optionsRef.current.shouldReconnect && optionsRef.current.shouldReconnect(event)) {
const reconnectAttempts = optionsRef.current.reconnectAttempts ?? DEFAULT_RECONNECT_LIMIT;
if (reconnectCount.current < reconnectAttempts) {
const nextReconnectInterval = typeof optionsRef.current.reconnectInterval === 'function' ?
optionsRef.current.reconnectInterval(reconnectCount.current) :
optionsRef.current.reconnectInterval;

reconnectTimeout = window.setTimeout(() => {
reconnectCount.current++;
reconnect();
}, nextReconnectInterval ?? DEFAULT_RECONNECT_INTERVAL_MS);
} else {
optionsRef.current.onReconnectStop && optionsRef.current.onReconnectStop(reconnectAttempts);
console.warn(`Max reconnect attempts of ${reconnectAttempts} exceeded`);
}
reconnectTimeout = reconnectIfBelowAttemptLimit(optionsRef.current, reconnectCount.current, () => {
reconnectCount.current++;
reconnect();
});
}
};

Expand All @@ -104,7 +94,7 @@ const bindErrorHandler = (
reconnect: () => void,
reconnectCount: MutableRefObject<number>,
) => {
let reconnectTimeout: number;
let reconnectTimeout: number | undefined;

webSocketInstance.onerror = (error: WebSocketEventMap['error']) => {
optionsRef.current.onError && optionsRef.current.onError(error);
Expand All @@ -119,27 +109,36 @@ const bindErrorHandler = (
setReadyState(ReadyState.CLOSED);
webSocketInstance.close();
}

if (optionsRef.current.retryOnError) {
if (reconnectCount.current < (optionsRef.current.reconnectAttempts ?? DEFAULT_RECONNECT_LIMIT)) {
const nextReconnectInterval = typeof optionsRef.current.reconnectInterval === 'function' ?
optionsRef.current.reconnectInterval(reconnectCount.current) :
optionsRef.current.reconnectInterval;

reconnectTimeout = window.setTimeout(() => {
reconnectCount.current++;
reconnect();
}, nextReconnectInterval ?? DEFAULT_RECONNECT_INTERVAL_MS);
} else {
optionsRef.current.onReconnectStop && optionsRef.current.onReconnectStop(optionsRef.current.reconnectAttempts as number);
console.warn(`Max reconnect attempts of ${optionsRef.current.reconnectAttempts} exceeded`);
}
reconnectTimeout = reconnectIfBelowAttemptLimit(optionsRef.current, reconnectCount.current, () => {
reconnectCount.current++;
reconnect();
});
}
};

return () => reconnectTimeout && window.clearTimeout(reconnectTimeout);
};

const reconnectIfBelowAttemptLimit = (
options: Options,
reconnectCount: number,
reconnect: () => void
) => {
const reconnectAttempts = options.reconnectAttempts ?? DEFAULT_RECONNECT_LIMIT;
if (reconnectCount >= reconnectAttempts) {
options.onReconnectStop && options.onReconnectStop(reconnectAttempts);
console.warn(`Max reconnect attempts of ${reconnectAttempts} exceeded`);
return;
}

const nextReconnectInterval = typeof options.reconnectInterval === 'function' ?
options.reconnectInterval(reconnectCount) :
options.reconnectInterval;
return window.setTimeout(reconnect, nextReconnectInterval ?? DEFAULT_RECONNECT_INTERVAL_MS);
}

export const attachListeners = (
webSocketInstance: WebSocketLike,
setters: Setters,
Expand Down