cloudstorm 0.4.0 → 0.4.1

package/README.md

@@ -17,9 +17,7 @@ const { Client } = require("cloudstorm");
 const bot = new Client(token, { intents: ["GUILDS"] });
 const startup = async () => {
 	await bot.connect();
-	bot.on("ready", () => {
-		console.log("Bot received ready event");
-	});
+	bot.on("ready", () => console.log("Bot received ready event"););
 };
 startup().catch(e => {
 	console.error("Error on startup!");
@@ -44,7 +42,7 @@ So an event you receive may look like this:
 		"roles": [],
 		"status": "offline",
 		"user": {
-		"id": "id"
+			"id": "id"
 		}
 	}
 }

package/dist/Client.js

@@ -4,13 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const version = require("../package.json").version;
 const events_1 = require("events");
-let Erlpack;
-try {
-    Erlpack = require("erlpack");
-}
-catch (e) {
-    Erlpack = null;
-}
 const Constants_1 = __importDefault(require("./Constants"));
 const snowtransfer_1 = require("snowtransfer");
 const ShardManager_1 = __importDefault(require("./ShardManager"));
@@ -24,9 +17,8 @@ class Client extends events_1.EventEmitter {
      */
     constructor(token, options = {}) {
         super();
-        if (!token) {
+        if (!token)
             throw new Error("Missing token!");
-        }
         this.options = {
             largeGuildThreshold: 250,
             firstShardId: 0,
@@ -37,7 +29,7 @@ class Client extends events_1.EventEmitter {
             token: "",
             ws: {
                 compress: true,
-                socket: undefined
+                encoding: "json"
             }
         };
         this._restClient = options.snowtransferInstance ? options.snowtransferInstance : new snowtransfer_1.SnowTransfer(token);
@@ -95,8 +87,7 @@ class Client extends events_1.EventEmitter {
      * });
      */
     async presenceUpdate(data) {
-        await this.shardManager.presenceUpdate(data);
-        void undefined;
+        return this.shardManager.presenceUpdate(data);
     }
     /**
      * Send an OP 3 PRESENCE_UPDATE to Discord, which updates the status of a single shard facilitated by this client's ShardManager.
@@ -159,9 +150,8 @@ class Client extends events_1.EventEmitter {
      * });
      */
     requestGuildMembers(shardId, data) {
-        if (!data.guild_id) {
+        if (!data.guild_id)
             throw new Error("You need to pass a guild_id");
-        }
         return this.shardManager.requestGuildMembers(shardId, data);
     }
     /**
@@ -169,8 +159,8 @@ class Client extends events_1.EventEmitter {
      * @param gatewayUrl Base gateway wss url to update the cached endpoint to.
      */
     _updateEndpoint(gatewayUrl) {
-        var _a;
-        this.options.endpoint = `${gatewayUrl}?v=${Constants_1.default.GATEWAY_VERSION}&encoding=${Erlpack ? "etf" : "json"}${((_a = this.options.ws) === null || _a === void 0 ? void 0 : _a.compress) ? "&compress=zlib-stream" : ""}`;
+        var _a, _b;
+        this.options.endpoint = `${gatewayUrl}?v=${Constants_1.default.GATEWAY_VERSION}&encoding=${((_a = this.options.ws) === null || _a === void 0 ? void 0 : _a.encoding) === "etf" ? "etf" : "json"}${((_b = this.options.ws) === null || _b === void 0 ? void 0 : _b.compress) ? "&compress=zlib-stream" : ""}`;
     }
 }
 Client.default = Client;

package/dist/Intents.d.ts

@@ -14,6 +14,7 @@ export declare const flags: {
     DIRECT_MESSAGES: number;
     DIRECT_MESSAGE_REACTIONS: number;
     DIRECT_MESSAGE_TYPING: number;
+    MESSAGE_CONTENT: number;
 };
 export declare const privileged: number;
 export declare const all: number;

package/dist/Intents.js

@@ -17,8 +17,9 @@ exports.flags = {
     DIRECT_MESSAGES: 1 << 12,
     DIRECT_MESSAGE_REACTIONS: 1 << 13,
     DIRECT_MESSAGE_TYPING: 1 << 14,
+    MESSAGE_CONTENT: 1 << 15,
 };
-exports.privileged = exports.flags.GUILD_MEMBERS | exports.flags.GUILD_PRESENCES | exports.flags.GUILD_MESSAGES;
+exports.privileged = exports.flags.GUILD_MEMBERS | exports.flags.GUILD_PRESENCES | exports.flags.GUILD_MESSAGES | exports.flags.MESSAGE_CONTENT;
 exports.all = Object.values(exports.flags).reduce((acc, p) => acc | p, 0);
 exports.non_privileged = exports.all & ~exports.privileged;
 function resolve(bit = 0) {

package/dist/Shard.d.ts

@@ -3,7 +3,6 @@ import { EventEmitter } from "events";
 import DiscordConnector from "./connector/DiscordConnector";
 interface ShardEvents {
     disconnect: [number, string, boolean];
-    error: [string];
     ready: [boolean];
     queueIdentify: [number];
 }

package/dist/Shard.js

@@ -40,15 +40,8 @@ class Shard extends events_1.EventEmitter {
             this.ready = false;
             this.emit("disconnect", ...args);
         });
-        this.connector.on("error", (err) => {
-            this.emit("error", err);
-        });
-        this.connector.on("ready", (resume) => {
-            this.emit("ready", resume);
-        });
-        this.connector.on("queueIdentify", () => {
-            this.emit("queueIdentify", this.id);
-        });
+        this.connector.on("ready", (resume) => this.emit("ready", resume));
+        this.connector.on("queueIdentify", () => this.emit("queueIdentify", this.id));
     }
     /**
      * Time in ms it took for Discord to ackknowledge an OP 1 HEARTBEAT.

package/dist/ShardManager.js

@@ -15,9 +15,8 @@ class ShardManager {
     constructor(client) {
         this.client = client;
         this.options = client.options;
-        if (!this.options.connectQueueInterval) {
+        if (!this.options.connectQueueInterval)
             this.options.connectQueueInterval = 1000 * 5;
-        }
         this.shards = {};
         this.connectQueue = [];
         this.lastConnectionAttempt = null;
@@ -92,9 +91,6 @@ class ShardManager {
             this.client.emit("shardReady", { id: shard.id, ready: !resume });
             this._checkReady();
         });
-        shard.on("error", (error) => {
-            this.client.emit("error", error);
-        });
         shard.on("disconnect", (code, reason, gracefulClose) => {
             this.client.emit("debug", `Websocket of shard ${shard.id} closed with code ${code} and reason: ${reason ? reason : "None"}`);
             if (code === 1000 && gracefulClose) {
@@ -117,9 +113,8 @@ class ShardManager {
     _checkReady() {
         for (const shardId in this.shards) {
             if (this.shards[shardId]) {
-                if (!this.shards[shardId].ready) {
+                if (!this.shards[shardId].ready)
                     return;
-                }
             }
         }
         this.client.emit("ready");
@@ -130,9 +125,8 @@ class ShardManager {
     _checkDisconnect() {
         for (const shardId in this.shards) {
             if (this.shards[shardId]) {
-                if (this.shards[shardId].connector.status !== "disconnected") {
+                if (this.shards[shardId].connector.status !== "disconnected")
                     return;
-                }
             }
         }
         this.client.emit("disconnected");
@@ -157,14 +151,10 @@ class ShardManager {
     shardPresenceUpdate(shardId, data) {
         return new Promise((res, rej) => {
             const shard = this.shards[shardId];
-            if (!shard) {
+            if (!shard)
                 rej(new Error(`Shard ${shardId} does not exist`));
-            }
-            if (!shard.ready) {
-                shard.once("ready", () => {
-                    shard.presenceUpdate(data).then(result => res(result)).catch(e => rej(e));
-                });
-            }
+            if (!shard.ready)
+                shard.once("ready", () => shard.presenceUpdate(data).then(result => res(result)).catch(e => rej(e)));
             shard.presenceUpdate(data).then(result => res(result)).catch(e => rej(e));
         });
     }
@@ -176,14 +166,10 @@ class ShardManager {
     voiceStateUpdate(shardId, data) {
         return new Promise((res, rej) => {
             const shard = this.shards[shardId];
-            if (!shard) {
+            if (!shard)
                 rej(new Error(`Shard ${shardId} does not exist`));
-            }
-            if (!shard.ready) {
-                shard.once("ready", () => {
-                    shard.voiceStateUpdate(data).then(result => res(result)).catch(e => rej(e));
-                });
-            }
+            if (!shard.ready)
+                shard.once("ready", () => shard.voiceStateUpdate(data).then(result => res(result)).catch(e => rej(e)));
             shard.voiceStateUpdate(data).then(result => res(result)).catch(e => rej(e));
         });
     }
@@ -195,14 +181,10 @@ class ShardManager {
     requestGuildMembers(shardId, data) {
         return new Promise((res, rej) => {
             const shard = this.shards[shardId];
-            if (!shard) {
+            if (!shard)
                 rej(new Error(`Shard ${shardId} does not exist`));
-            }
-            if (!shard.ready) {
-                shard.once("ready", () => {
-                    shard.requestGuildMembers(data).then(result => res(result)).catch(e => rej(e));
-                });
-            }
+            if (!shard.ready)
+                shard.once("ready", () => shard.requestGuildMembers(data).then(result => res(result)).catch(e => rej(e)));
             shard.requestGuildMembers(data).then(result => res(result)).catch(e => rej(e));
         });
     }

package/dist/Types.d.ts

@@ -1,4 +1,3 @@
-import Constants from "./Constants";
 export interface IntentFlags {
     GUILDS: number;
     GUILD_MEMBERS: number;
@@ -18,53 +17,27 @@ export interface IntentFlags {
 }
 export declare type IntentResolvable = number | Array<number> | keyof IntentFlags | Array<keyof IntentFlags>;
 export interface IWSMessage {
-    op: typeof Constants["GATEWAY_OP_CODES"][keyof typeof Constants.GATEWAY_OP_CODES];
+    op: import("discord-typings").GatewayOpcode;
     d?: any;
     s?: number;
-    t?: string;
+    t?: import("discord-typings").GatewayEvent;
 }
 export interface IGatewayMessage extends IWSMessage {
     shard_id: number;
 }
-export interface IPresenceActivity {
-    name: string;
-    type?: 0 | 1 | 2 | 3 | 5;
-    url?: string;
-}
-export interface IPresence {
-    status?: "online" | "idle" | "dnd" | "offline";
-    afk?: boolean;
-    since?: boolean;
-    activities?: Array<IPresenceActivity> | null;
-}
 export interface IClientOptions {
     largeGuildThreshold?: number;
     firstShardId?: number;
     lastShardId?: number;
     shardAmount?: number;
     reconnect?: boolean;
-    initialPresence?: IPresence;
+    initialPresence?: import("discord-typings").GatewayPresenceUpdate;
     intents?: IntentResolvable;
     connectQueueInterval?: number;
     snowtransferInstance?: import("snowtransfer").SnowTransfer;
     ws?: IClientWSOptions;
 }
-export interface IVoiceStateUpdate {
-    guild_id: string;
-    channel_id?: string | null;
-    self_mute?: boolean;
-    self_deaf?: boolean;
-}
-export interface IRequestGuildMembers {
-    guild_id: string;
-    query?: string | null;
-    limit?: number;
-}
-export interface IShardReady {
-    id: number;
-    ready: boolean;
-}
 export interface IClientWSOptions {
     compress?: boolean;
-    socket?: import("ws").ClientOptions;
+    encoding?: "etf" | "json";
 }

package/dist/connector/DiscordConnector.d.ts

@@ -5,8 +5,8 @@ interface ConnectorEvents {
     queueIdentify: [number];
     event: [import("../Types").IWSMessage];
     ready: [boolean];
-    error: [string];
     disconnect: [number, string, boolean];
+    stateChange: ["connecting" | "identifying" | "resuming" | "ready" | "disconnected"];
 }
 interface DiscordConnector {
     addListener<E extends keyof ConnectorEvents>(event: E, listener: (...args: ConnectorEvents[E]) => any): this;
@@ -33,12 +33,12 @@ declare class DiscordConnector extends EventEmitter {
     client: import("../Client");
     options: import("../Client")["options"];
     reconnect: boolean;
-    betterWs: BetterWs | null;
+    betterWs: BetterWs;
     heartbeatTimeout: NodeJS.Timeout | null;
     heartbeatInterval: number;
     _trace: string | null;
     seq: number;
-    status: string;
+    status: "connecting" | "identifying" | "resuming" | "ready" | "disconnected";
     sessionId: string | null;
     lastACKAt: number;
     lastHeartbeatSend: number;
@@ -53,7 +53,7 @@ declare class DiscordConnector extends EventEmitter {
     /**
      * Connect to Discord.
      */
-    connect(): void;
+    connect(): Promise<void>;
     /**
      * Close the websocket connection and disconnect.
      */

package/dist/connector/DiscordConnector.js

@@ -6,7 +6,6 @@ const events_1 = require("events");
 const BetterWs_1 = __importDefault(require("../structures/BetterWs"));
 const Constants_1 = require("../Constants");
 const Intents_1 = __importDefault(require("../Intents"));
-const ws_1 = __importDefault(require("ws"));
 let reconnecting = false;
 /**
  * Class used for acting based on received events.
@@ -21,12 +20,11 @@ class DiscordConnector extends events_1.EventEmitter {
      */
     constructor(id, client) {
         super();
-        this.betterWs = null;
         this.heartbeatTimeout = null;
         this.heartbeatInterval = 0;
         this._trace = null;
         this.seq = 0;
-        this.status = "init";
+        this.status = "disconnected";
         this.sessionId = null;
         this.lastACKAt = 0;
         this.lastHeartbeatSend = 0;
@@ -35,37 +33,28 @@ class DiscordConnector extends events_1.EventEmitter {
         this.client = client;
         this.options = client.options;
         this.reconnect = this.options.reconnect || true;
-    }
-    /**
-     * Connect to Discord.
-     */
-    connect() {
-        if (!this.betterWs) {
-            this.betterWs = new BetterWs_1.default(this.options.endpoint, this.options.ws);
-        }
-        else {
-            this.betterWs.removeAllListeners();
-            this.betterWs.recreateWs(this.options.endpoint, this.options.ws);
-        }
+        this.betterWs = new BetterWs_1.default(this.options.endpoint, this.options.ws);
         this.betterWs.on("ws_open", () => {
             this.status = "connecting";
+            this.emit("stateChange", "connecting");
             reconnecting = false;
         });
         this.betterWs.on("ws_message", msg => this.messageAction(msg));
         this.betterWs.on("ws_close", (code, reason) => this.handleWsClose(code, reason));
-        this.betterWs.on("debug", event => {
-            this.client.emit("debug", event);
-        });
-        this.betterWs.on("debug_send", data => {
-            this.client.emit("rawSend", data);
-        });
+        this.betterWs.on("debug", event => this.client.emit("debug", event));
+        this.betterWs.on("debug_send", data => this.client.emit("rawSend", data));
+    }
+    /**
+     * Connect to Discord.
+     */
+    connect() {
+        return this.betterWs.connect();
     }
     /**
      * Close the websocket connection and disconnect.
      */
     async disconnect() {
-        var _a;
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.close(1000, "Disconnected by User");
+        return this.betterWs.close();
     }
     /**
      * Called with a parsed Websocket message to execute further actions.
@@ -96,9 +85,8 @@ class DiscordConnector extends events_1.EventEmitter {
                     this.disconnect();
                 break;
             case Constants_1.GATEWAY_OP_CODES.INVALID_SESSION:
-                if (message.d && this.sessionId) {
+                if (message.d && this.sessionId)
                     this.resume();
-                }
                 else {
                     this.seq = 0;
                     this.sessionId = "";
@@ -116,9 +104,8 @@ class DiscordConnector extends events_1.EventEmitter {
                         else
                             this.disconnect();
                     }
-                    else {
+                    else
                         this.heartbeat();
-                    }
                 }, this.heartbeatInterval);
                 this._trace = message.d._trace;
                 this.identify();
@@ -137,24 +124,15 @@ class DiscordConnector extends events_1.EventEmitter {
      * @param resume Whether or not the client intends to send an OP 6 RESUME later.
      */
     async _reconnect(resume = false) {
-        var _a, _b, _c;
         if (resume)
             reconnecting = true;
-        if (((_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.ws.readyState) === ws_1.default.CONNECTING) {
-            this.emit("error", `Client was attempting to ${resume ? "resume" : "reconnect"} while the WebSocket was still in the connecting state. This should never happen.${this.options.reconnect ? " Restarting the connect loop." : ""}`);
-            this.reset();
-            if (this.options.reconnect)
-                this.connect();
-        }
-        // This is for instances where the gateway asks the client to reconnect. The ws would be closed by the time the code reaches here.
-        if (((_b = this.betterWs) === null || _b === void 0 ? void 0 : _b.ws.readyState) === ws_1.default.OPEN)
-            await ((_c = this.betterWs) === null || _c === void 0 ? void 0 : _c.close(resume ? 4000 : 1012, "reconnecting"));
-        if (resume) {
+        if (this.betterWs.status === 2)
+            void this.client.emit("error", `Client was attempting to ${resume ? "resume" : "reconnect"} while the WebSocket was still in the connecting state. This should never happen.`);
+        await this.betterWs.close();
+        if (resume)
             this.clearHeartBeat();
-        }
-        else {
+        else
             this.reset();
-        }
         this.connect();
     }
     /**
@@ -181,10 +159,12 @@ class DiscordConnector extends events_1.EventEmitter {
      * @param force Whether CloudStorm should send an OP 2 IDENTIFY even if there's a session that could be resumed.
      */
     async identify(force) {
-        var _a;
-        if (this.sessionId && !force) {
+        if (this.betterWs.status !== 1)
+            void this.client.emit("debug", "Client was attempting to identify when the ws was not open");
+        if (this.sessionId && !force)
             return this.resume();
-        }
+        this.status = "identifying";
+        this.emit("stateChange", "identifying");
         const data = {
             op: Constants_1.GATEWAY_OP_CODES.IDENTIFY,
             d: {
@@ -201,14 +181,17 @@ class DiscordConnector extends events_1.EventEmitter {
         };
         if (this.options.initialPresence)
             Object.assign(data.d, { presence: this._checkPresenceData(this.options.initialPresence) });
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.sendMessage(data);
+        return this.betterWs.sendMessage(data);
     }
     /**
      * Send an OP 6 RESUME to the gateway.
      */
     async resume() {
-        var _a;
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.sendMessage({
+        if (this.betterWs.status !== 1)
+            void this.client.emit("debug", "Client was attempting to resume when the ws was not open");
+        this.status = "resuming";
+        this.emit("stateChange", "resuming");
+        return this.betterWs.sendMessage({
             op: Constants_1.GATEWAY_OP_CODES.RESUME,
             d: { seq: this.seq, token: this.options.token, session_id: this.sessionId }
         });
@@ -217,10 +200,9 @@ class DiscordConnector extends events_1.EventEmitter {
      * Send an OP 1 HEARTBEAT to the gateway.
      */
     heartbeat() {
-        var _a, _b;
-        if (((_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.ws.readyState) !== ws_1.default.OPEN)
-            return;
-        (_b = this.betterWs) === null || _b === void 0 ? void 0 : _b.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.HEARTBEAT, d: this.seq });
+        if (this.betterWs.status !== 1)
+            void this.client.emit("debug", "Client was attempting to heartbeat when the ws was not open");
+        this.betterWs.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.HEARTBEAT, d: this.seq });
         this.lastHeartbeatSend = Date.now();
     }
     /**
@@ -231,10 +213,10 @@ class DiscordConnector extends events_1.EventEmitter {
         switch (message.t) {
             case "READY":
             case "RESUMED":
-                if (message.t === "READY") {
+                if (message.t === "READY")
                     this.sessionId = message.d.session_id;
-                }
                 this.status = "ready";
+                this.emit("stateChange", "ready");
                 this._trace = message.d._trace;
                 this.emit("ready", message.t === "RESUMED");
                 this.emit("event", message);
@@ -249,94 +231,86 @@ class DiscordConnector extends events_1.EventEmitter {
      * @param reason Close reason if any.
      */
     handleWsClose(code, reason) {
-        var _a;
         let gracefulClose = false;
         this.status = "disconnected";
+        this.emit("stateChange", "disconnected");
         // Disallowed Intents.
-        if (code === 4014) {
-            this.emit("error", "Disallowed Intents, check your client options and application page.");
-        }
+        if (code === 4014)
+            this.client.emit("error", "Disallowed Intents, check your client options and application page.");
         // Invalid Intents.
-        if (code === 4013) {
-            this.emit("error", "Invalid Intents data, check your client options.");
-        }
+        if (code === 4013)
+            this.client.emit("error", "Invalid Intents data, check your client options.");
         // Invalid API version.
-        if (code === 4012) {
-            this.emit("error", "Invalid API version.");
-        }
+        if (code === 4012)
+            this.client.emit("error", "Invalid API version.");
         // Sharding required.
-        if (code === 4011) {
-            this.emit("error", "Shard would be on over 2500 guilds. Add more shards.");
-        }
+        if (code === 4011)
+            this.client.emit("error", "Shard would be on over 2500 guilds. Add more shards.");
         // Invalid shard.
-        if (code === 4010) {
-            this.emit("error", "Invalid sharding data, check your client options.");
-        }
+        if (code === 4010)
+            this.client.emit("error", "Invalid sharding data, check your client options.");
         // Session timed out.
         // force identify if the session is marked as invalid.
         if (code === 4009) {
-            this.emit("error", "Session timed out.");
+            this.client.emit("error", "Session timed out.");
             this.clearHeartBeat();
             this.connect();
         }
         // Rate limited.
         if (code === 4008) {
-            this.emit("error", "You are being rate limited. Wait before sending more packets.");
+            this.client.emit("error", "You are being rate limited. Wait before sending more packets.");
             this.clearHeartBeat();
             this.connect();
         }
         // Invalid sequence.
         if (code === 4007) {
-            this.emit("error", "Invalid sequence. Reconnecting and starting a new session.");
+            this.client.emit("error", "Invalid sequence. Reconnecting and starting a new session.");
             this.reset();
             this.connect();
         }
         // Already authenticated.
         if (code === 4005) {
-            this.emit("error", "You sent more than one OP 2 IDENTIFY payload while the websocket was open.");
+            this.client.emit("error", "You sent more than one OP 2 IDENTIFY payload while the websocket was open.");
             this.clearHeartBeat();
             this.connect();
         }
         // Authentication failed.
-        if (code === 4004) {
-            this.emit("error", "Tried to connect with an invalid token");
-        }
+        if (code === 4004)
+            this.client.emit("error", "Tried to connect with an invalid token");
         // Not authenticated.
         if (code === 4003) {
-            this.emit("error", "You tried to send a packet before sending an OP 2 IDENTIFY or OP 6 RESUME.");
+            this.client.emit("error", "You tried to send a packet before sending an OP 2 IDENTIFY or OP 6 RESUME.");
             this.clearHeartBeat();
             this.connect();
         }
         // Decode error.
         if (code === 4002) {
-            this.emit("error", "You sent an invalid payload");
+            this.client.emit("error", "You sent an invalid payload");
             this.clearHeartBeat();
             this.connect();
         }
         // Invalid opcode.
         if (code === 4001) {
-            this.emit("error", "You sent an invalid opcode or invalid payload for an opcode");
+            this.client.emit("error", "You sent an invalid opcode or invalid payload for an opcode");
             this.clearHeartBeat();
             this.connect();
         }
         // Generic error / safe self closing code.
         if (code === 4000) {
-            if (reconnecting) {
+            if (reconnecting)
                 gracefulClose = true;
-            }
             else {
-                this.emit("error", "Error code 4000 received. Attempting to resume");
+                this.client.emit("error", "Error code 4000 received. Attempting to resume");
                 this.clearHeartBeat();
                 this.connect();
             }
         }
         // Don't try to reconnect when true
-        if (code === 1000 && reason === "Disconnected by User") {
+        if (code === 1000 && reason === "Disconnected by User")
             gracefulClose = true;
-        }
         if (gracefulClose) {
             this.clearHeartBeat();
-            (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            this.betterWs.removeAllListeners();
         }
         this.emit("disconnect", code, reason, gracefulClose);
     }
@@ -345,27 +319,23 @@ class DiscordConnector extends events_1.EventEmitter {
      * @param data Presence data to send.
      */
     async presenceUpdate(data) {
-        var _a;
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.PRESENCE_UPDATE, d: this._checkPresenceData(data) });
+        return this.betterWs.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.PRESENCE_UPDATE, d: this._checkPresenceData(data) });
     }
     /**
      * Send an OP 4 VOICE_STATE_UPDATE to the gateway.
      * @param data Voice state update data to send.
      */
     async voiceStateUpdate(data) {
-        var _a;
-        if (!data) {
+        if (!data)
             return Promise.resolve();
-        }
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.VOICE_STATE_UPDATE, d: this._checkVoiceStateUpdateData(data) });
+        return this.betterWs.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.VOICE_STATE_UPDATE, d: this._checkVoiceStateUpdateData(data) });
     }
     /**
      * Send an OP 8 REQUEST_GUILD_MEMBERS to the gateway.
      * @param data Data to send.
      */
     async requestGuildMembers(data) {
-        var _a;
-        return (_a = this.betterWs) === null || _a === void 0 ? void 0 : _a.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.REQUEST_GUILD_MEMBERS, d: this._checkRequestGuildMembersData(data) });
+        return this.betterWs.sendMessage({ op: Constants_1.GATEWAY_OP_CODES.REQUEST_GUILD_MEMBERS, d: this._checkRequestGuildMembersData(data) });
     }
     /**
      * Checks presence data and fills in missing elements.