Skip to content

Fix(websocket): Do not crash app when a reserved close code is passed (Android) #108

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 2 commits into
base: master
Choose a base branch
from
Open

Fix(websocket): Do not crash app when a reserved close code is passed (Android) #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3171dd3
fix: do not crash app when a reserved close code is passed
canmertc Mar 19, 2025
b44f301
fix: align with iOS close code
canmertc Mar 20, 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
14 changes: 13 additions & 1 deletion src/websocket/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,19 @@ export class WebsocketConnection implements IWebsocketConnection {
}

close(code: number, reason: string) {
return this.nativeConnection.close(code, reason);
try {
if ((code >= 1004 && code <= 1006) || (code >= 1015 && code <= 2999)) {
console.warn(`Code ${code} is reserved and may not be used.`);
// Fall back to an accepted code. Otherwise, the error will be caught by try/catch, but the connection won't be closed.
// https://github.com/square/okhttp/blob/master/okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt#L146
// https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
code = 1001;
}
return this.nativeConnection.close(code, reason);
} catch (error) {
console.error(error);
return false;
}
}

cancel() {
Expand Down