Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 11:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(WebSocketShard): error event handling (#10436)

Browse Source 
* refactor(WebSocketShard): error event handling

* chore: blehhhh :pppp

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
DD
2024-08-15 19:10:25 +03:00
committed by GitHub
parent 432e9b8425
commit a6de2707fc
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ws/src/utils/constants.ts
View File

@@ -82,5 +82,3 @@ export function getInitialSendRateLimitState(): SendRateLimitState {
resetAt: Date.now() + 60_000, resetAt: Date.now() + 60_000,
}; };
} }
export const KnownNetworkErrorCodes = new Set(['ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'EAI_AGAIN']);

1
packages/ws/src/ws/WebSocketManager.ts
View File

@@ -210,6 +210,7 @@ export interface ManagerShardEventsMap {
stats: { ackAt: number; heartbeatAt: number; latency: number }, stats: { ackAt: number; heartbeatAt: number; latency: number },
shardId: number, shardId: number,
]; ];
[WebSocketShardEvents.SocketError]: [error: Error, shardId: number];
} }
export class WebSocketManager extends AsyncEventEmitter<ManagerShardEventsMap> implements AsyncDisposable { export class WebSocketManager extends AsyncEventEmitter<ManagerShardEventsMap> implements AsyncDisposable {

12
packages/ws/src/ws/WebSocketShard.ts
View File

@@ -26,7 +26,6 @@ import {
CompressionMethod, CompressionMethod,
CompressionParameterMap, CompressionParameterMap,
ImportantGatewayOpcodes, ImportantGatewayOpcodes,
KnownNetworkErrorCodes,
getInitialSendRateLimitState, getInitialSendRateLimitState,
} from '../utils/constants.js'; } from '../utils/constants.js';
import type { SessionInfo } from './WebSocketManager.js'; import type { SessionInfo } from './WebSocketManager.js';
@@ -45,6 +44,7 @@ export enum WebSocketShardEvents {
Hello = 'hello', Hello = 'hello',
Ready = 'ready', Ready = 'ready',
Resumed = 'resumed', Resumed = 'resumed',
SocketError = 'socketError',
} }
export enum WebSocketShardStatus { export enum WebSocketShardStatus {
@@ -68,6 +68,7 @@ export interface WebSocketShardEventsMap {
[WebSocketShardEvents.Ready]: [payload: GatewayReadyDispatchData]; [WebSocketShardEvents.Ready]: [payload: GatewayReadyDispatchData];
[WebSocketShardEvents.Resumed]: []; [WebSocketShardEvents.Resumed]: [];
[WebSocketShardEvents.HeartbeatComplete]: [stats: { ackAt: number; heartbeatAt: number; latency: number }]; [WebSocketShardEvents.HeartbeatComplete]: [stats: { ackAt: number; heartbeatAt: number; latency: number }];
[WebSocketShardEvents.SocketError]: [error: Error];
} }
export interface WebSocketShardDestroyOptions { export interface WebSocketShardDestroyOptions {
@@ -791,13 +792,8 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
} }
private onError(error: Error) { private onError(error: Error) {
if ('code' in error && KnownNetworkErrorCodes.has(error.code as string)) { this.emit(WebSocketShardEvents.SocketError, error);
this.debug(['Failed to connect to the gateway URL specified due to a network error']); this.failedToConnectDueToNetworkError = true;
this.failedToConnectDueToNetworkError = true;
return;
}
this.emit(WebSocketShardEvents.Error, error);
} }
private async onClose(code: number) { private async onClose(code: number) {