Skip to content

Commit a6de270

Browse files
refactor(WebSocketShard): error event handling (#10436)
* refactor(WebSocketShard): error event handling * chore: blehhhh :pppp --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 432e9b8 commit a6de270

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

packages/ws/src/utils/constants.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,3 @@ export function getInitialSendRateLimitState(): SendRateLimitState {
8282
resetAt: Date.now() + 60_000,
8383
};
8484
}
85-
86-
export const KnownNetworkErrorCodes = new Set(['ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'EAI_AGAIN']);

packages/ws/src/ws/WebSocketManager.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export interface ManagerShardEventsMap {
210210
stats: { ackAt: number; heartbeatAt: number; latency: number },
211211
shardId: number,
212212
];
213+
[WebSocketShardEvents.SocketError]: [error: Error, shardId: number];
213214
}
214215

215216
export class WebSocketManager extends AsyncEventEmitter<ManagerShardEventsMap> implements AsyncDisposable {

packages/ws/src/ws/WebSocketShard.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
CompressionMethod,
2727
CompressionParameterMap,
2828
ImportantGatewayOpcodes,
29-
KnownNetworkErrorCodes,
3029
getInitialSendRateLimitState,
3130
} from '../utils/constants.js';
3231
import type { SessionInfo } from './WebSocketManager.js';
@@ -45,6 +44,7 @@ export enum WebSocketShardEvents {
4544
Hello = 'hello',
4645
Ready = 'ready',
4746
Resumed = 'resumed',
47+
SocketError = 'socketError',
4848
}
4949

5050
export enum WebSocketShardStatus {
@@ -68,6 +68,7 @@ export interface WebSocketShardEventsMap {
6868
[WebSocketShardEvents.Ready]: [payload: GatewayReadyDispatchData];
6969
[WebSocketShardEvents.Resumed]: [];
7070
[WebSocketShardEvents.HeartbeatComplete]: [stats: { ackAt: number; heartbeatAt: number; latency: number }];
71+
[WebSocketShardEvents.SocketError]: [error: Error];
7172
}
7273

7374
export interface WebSocketShardDestroyOptions {
@@ -791,13 +792,8 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
791792
}
792793

793794
private onError(error: Error) {
794-
if ('code' in error && KnownNetworkErrorCodes.has(error.code as string)) {
795-
this.debug(['Failed to connect to the gateway URL specified due to a network error']);
796-
this.failedToConnectDueToNetworkError = true;
797-
return;
798-
}
799-
800-
this.emit(WebSocketShardEvents.Error, error);
795+
this.emit(WebSocketShardEvents.SocketError, error);
796+
this.failedToConnectDueToNetworkError = true;
801797
}
802798

803799
private async onClose(code: number) {

0 commit comments

Comments
 (0)