From 6094985396caef486b8aae785c16a37fd1dfd95a Mon Sep 17 00:00:00 2001 From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> Date: Sun, 19 Feb 2023 15:12:06 +0000 Subject: [PATCH] fix: more bugs --- packages/client/src/gateway/Shard.ts | 1 - packages/client/src/utils/BrowserWebSocket.ts | 46 ++++++++++++++----- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/packages/client/src/gateway/Shard.ts b/packages/client/src/gateway/Shard.ts index 4f312d940..ff39ac435 100644 --- a/packages/client/src/gateway/Shard.ts +++ b/packages/client/src/gateway/Shard.ts @@ -65,7 +65,6 @@ import Member from '../Structures/guilds/Member.js' import Role from '../Structures/guilds/Role.js' import StageInstance from '../Structures/guilds/StageInstance.js' import UnavailableGuild from '../Structures/guilds/Unavailable.js' -import Interaction from '../Structures/interactions/Interaction.js' import Invite from '../Structures/Invite.js' import Message from '../Structures/Message.js' import ExtendedUser from '../Structures/users/Extended.js' diff --git a/packages/client/src/utils/BrowserWebSocket.ts b/packages/client/src/utils/BrowserWebSocket.ts index 0c4cae659..afe59fb63 100644 --- a/packages/client/src/utils/BrowserWebSocket.ts +++ b/packages/client/src/utils/BrowserWebSocket.ts @@ -1,14 +1,9 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/no-var-requires */ -let EventEmitter -try { - EventEmitter = require('eventemitter3') -} catch (err) { - EventEmitter = require('events').EventEmitter -} +import { EventEmitter } from "events" class BrowserWebSocketError extends Error { - static CONNECTING: 0 + static CONNECTING: 0 = 0 static OPEN: 1 static CLOSING: 2 static CLOSED: 3 @@ -49,6 +44,38 @@ class BrowserWebSocket extends EventEmitter { return this._ws.readyState } + static get CONNECTING() { + return 0 + } + + static set CONNECTING(state: number) { + BrowserWebSocket.CONNECTING = state; + } + + static get OPEN() { + return 1 + } + + static set OPEN(state: number) { + BrowserWebSocket.OPEN = state; + } + + static get CLOSING() { + return 2 + } + + static set CLOSING(state: number) { + BrowserWebSocket.CLOSING = state; + } + + static get CLOSED() { + return 3 + } + + static set CLOSED(state: number) { + BrowserWebSocket.CLOSED = state; + } + close(code?: number, reason?: string) { return this._ws.close(code, reason) } @@ -74,9 +101,4 @@ class BrowserWebSocket extends EventEmitter { } } -BrowserWebSocket.CONNECTING = 0 -BrowserWebSocket.OPEN = 1 -BrowserWebSocket.CLOSING = 2 -BrowserWebSocket.CLOSED = 3 - export default BrowserWebSocket