disgroove 3.0.0-dev.950983e → 3.0.0-dev.97f3796

package/dist/lib/Client.d.ts

@@ -41,7 +41,6 @@ export interface GatewayOptions {
 export interface ClientOptions {
     shardsCount?: number | "auto";
     auth?: "Bot" | "Bearer";
-    reconnect?: boolean;
     gateway?: GatewayOptions;
     ws?: WebSocketOptions;
 }
@@ -54,7 +53,6 @@ export declare class Client extends EventEmitter {
     intents: GatewayIntents | number;
     shardsCount: number | "auto";
     auth: "Bot" | "Bearer";
-    reconnect: boolean;
     shards: Map<number, Shard>;
     rest: RequestManager;
     guildShardMap: Map<string, number>;

package/dist/lib/Client.js

@@ -18,7 +18,6 @@ class Client extends node_events_1.default {
     intents;
     shardsCount;
     auth;
-    reconnect;
     shards;
     rest;
     guildShardMap;
@@ -41,7 +40,6 @@ class Client extends node_events_1.default {
                 : 0;
         this.shardsCount = options?.shardsCount ?? "auto";
         this.auth = options?.auth ?? "Bot";
-        this.reconnect = options?.reconnect ?? true;
         this.shards = new Map();
         this.rest = new rest_1.RequestManager(token, this.auth);
         this.guildShardMap = new Map();
@@ -167,7 +165,7 @@ class Client extends node_events_1.default {
                 : this.shardsCount;
         for (let i = 0; i < this.shardsCount; i++)
             this.shards.set(i, new gateway_1.Shard(i, this));
-        this.shards.forEach((shard) => shard.connect());
+        this.shards.forEach((shard) => shard.connect(false));
     }
     /** https://discord.com/developers/docs/resources/entitlement#consume-an-entitlement */
     consumeEntitlement(applicationId, entitlementId) {
@@ -878,7 +876,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/events/gateway#initiating-a-disconnect */
     disconnect() {
-        this.shards.forEach((shard) => shard.disconnect(false));
+        this.shards.forEach((shard) => shard.disconnect());
     }
     /** https://discord.com/developers/docs/resources/auto-moderation#modify-auto-moderation-rule */
     async editAutoModerationRule(guildId, autoModerationRuleId, options, reason) {
@@ -2363,9 +2361,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     joinVoiceChannel(guildId, channelId, options) {
-        this.shards
-            .get(this.guildShardMap.get(guildId))
-            .manager.updateVoiceState({
+        this.shards.get(this.guildShardMap.get(guildId)).updateVoiceState({
             guildId,
             channelId,
             selfMute: !!options?.selfMute,
@@ -2386,9 +2382,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     leaveVoiceChannel(guildId) {
-        this.shards
-            .get(this.guildShardMap.get(guildId))
-            .manager.updateVoiceState({
+        this.shards.get(this.guildShardMap.get(guildId)).updateVoiceState({
             guildId,
             channelId: null,
             selfMute: false,
@@ -2461,7 +2455,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
     setPresence(options) {
-        this.shards.forEach((shard) => shard.manager.updatePresence(options));
+        this.shards.forEach((shard) => shard.updatePresence(options));
     }
     /** https://discord.com/developers/docs/resources/guild-template#sync-guild-template */
     async syncGuildTemplate(guildId, code) {

package/dist/lib/gateway/Shard.d.ts

@@ -1,25 +1,38 @@
 import WebSocket from "ws";
 import { Client } from "../Client";
-import { WebSocketManager } from "./WebSocketManager";
+import type { GatewayPresenceUpdate, GatewayVoiceStateUpdate, Identify, RequestGuildMembers, RequestSoundboardSounds, Resume } from "../types/gateway-events";
 export declare class Shard {
     id: number;
     private heartbeatInterval;
     client: Client;
     ws: WebSocket | null;
-    manager: WebSocketManager;
     sessionId: string | null;
     resumeGatewayURL: string | null;
     sequence: number | null;
     constructor(id: number, client: Client);
     /** https://discord.com/developers/docs/topics/gateway#connections */
-    connect(): void;
+    connect(reconnect: boolean): void;
     /** https://discord.com/developers/docs/events/gateway#initiating-a-disconnect */
-    disconnect(reconnect: boolean): void;
-    identify(): void;
+    disconnect(): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
+    heartbeat(lastSequence: number | null): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#identify */
+    identify(options: Identify): void;
     private onDispatch;
     private onWebSocketOpen;
     private onWebSocketMessage;
     private onWebSocketError;
     private onWebSocketClose;
-    resume(): void;
+    /** https://discord.com/developers/docs/events/gateway#resuming */
+    reconnect(): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
+    requestGuildMembers(options: RequestGuildMembers): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#request-soundboard-sounds */
+    requestSoundboardSounds(options: RequestSoundboardSounds): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#resume */
+    resume(options: Resume): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
+    updatePresence(options: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>): void;
+    /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
+    updateVoiceState(options: GatewayVoiceStateUpdate): void;
 }

package/dist/lib/gateway/Shard.js

@@ -42,13 +42,11 @@ const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const pkg = __importStar(require("../../package.json"));
 const transformers_1 = require("../transformers");
-const WebSocketManager_1 = require("./WebSocketManager");
 class Shard {
     id;
     heartbeatInterval;
     client;
     ws;
-    manager;
     sessionId;
     resumeGatewayURL;
     sequence;
@@ -57,86 +55,62 @@ class Shard {
         this.heartbeatInterval = null;
         this.client = client;
         this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", this.client.ws);
-        this.manager = new WebSocketManager_1.WebSocketManager(this.ws);
         this.sessionId = null;
         this.resumeGatewayURL = null;
         this.sequence = null;
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
-    connect() {
+    connect(reconnect) {
         if (this.ws) {
-            this.ws.on("open", () => this.onWebSocketOpen());
+            this.ws.on("open", () => this.onWebSocketOpen(reconnect));
             this.ws.on("message", (data) => this.onWebSocketMessage(data));
             this.ws.on("error", (err) => this.onWebSocketError(err));
             this.ws.on("close", (code, reason) => this.onWebSocketClose(code, reason));
         }
     }
     /** https://discord.com/developers/docs/events/gateway#initiating-a-disconnect */
-    disconnect(reconnect) {
-        if (this.heartbeatInterval) {
-            clearInterval(this.heartbeatInterval);
-            this.heartbeatInterval = null;
-        }
+    disconnect() {
         if (this.ws) {
+            if (this.heartbeatInterval) {
+                clearInterval(this.heartbeatInterval);
+                this.heartbeatInterval = null;
+            }
             if (this.ws.readyState !== ws_1.default.CLOSED) {
                 this.ws.removeAllListeners();
-                if (reconnect &&
-                    this.sessionId &&
-                    this.sequence &&
-                    this.resumeGatewayURL) {
-                    if (this.ws.readyState === ws_1.default.OPEN) {
-                        this.ws.terminate();
-                    }
-                    else {
-                        this.ws.close(1000, "Resume Attempt - Reconnect");
-                    }
-                }
-                else {
-                    this.ws.close(1000, "Session Invalidated - Disconnect");
-                }
+                this.ws.close(1000, "Session Invalidated - Disconnect");
                 this.ws = null;
-                this.manager = new WebSocketManager_1.WebSocketManager(this.ws);
-            }
-            if (reconnect &&
-                this.sessionId &&
-                this.sequence &&
-                this.resumeGatewayURL) {
-                this.ws = new ws_1.default(this.resumeGatewayURL, this.client.ws);
-                this.manager = new WebSocketManager_1.WebSocketManager(this.ws);
-                this.connect();
             }
         }
     }
-    identify() {
-        this.manager.identify({
-            token: this.client.token,
-            properties: {
-                os: this.client.properties?.os ?? process.platform,
-                browser: this.client.properties?.browser ?? pkg.name,
-                device: this.client.properties?.device ?? pkg.name,
-            },
-            compress: this.client.compress,
-            largeThreshold: this.client.largeThreshold,
-            shard: [this.id, this.client.shardsCount],
-            presence: this.client.presence !== undefined
-                ? {
-                    since: this.client.presence.status === constants_1.StatusTypes.Idle
-                        ? Date.now()
-                        : null,
-                    activities: this.client.presence.activities?.map((activity) => ({
-                        name: activity.type === constants_1.ActivityType.Custom
-                            ? "Custom Status"
-                            : activity.name,
-                        type: activity.type,
-                        url: activity.url,
-                        state: activity.state,
-                    })),
-                    status: this.client.presence.status ?? constants_1.StatusTypes.Online,
-                    afk: !!this.client.presence.afk,
-                }
-                : undefined,
-            intents: this.client.intents,
-        });
+    /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
+    heartbeat(lastSequence) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.Heartbeat,
+                d: lastSequence,
+            }));
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#identify */
+    identify(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.Identify,
+                d: {
+                    token: options.token,
+                    properties: {
+                        os: options.properties.os,
+                        browser: options.properties.browser,
+                        device: options.properties.device,
+                    },
+                    compress: options.compress,
+                    large_threshold: options.largeThreshold,
+                    shard: options.shard,
+                    presence: options.presence,
+                    intents: options.intents,
+                },
+            }));
+        }
     }
     onDispatch(packet) {
         this.sequence = packet.s;
@@ -485,9 +459,9 @@ class Shard {
             case constants_1.GatewayEvents.MessageReactionAdd:
                 this.client.emit("messageReactionAdd", {
                     userId: packet.d.user_id,
-                    channelId: packet.d.channel_id,
-                    messageId: packet.d.message_id,
-                    guildId: packet.d.guild_id,
+                    channelId: packet.d.user_id,
+                    messageId: packet.d.user_id,
+                    guildId: packet.d.user_id,
                     member: packet.d.member !== undefined
                         ? transformers_1.Guilds.guildMemberFromRaw(packet.d.member)
                         : undefined,
@@ -501,9 +475,9 @@ class Shard {
             case constants_1.GatewayEvents.MessageReactionRemove:
                 this.client.emit("messageReactionRemove", {
                     userId: packet.d.user_id,
-                    channelId: packet.d.channel_id,
-                    messageId: packet.d.message_id,
-                    guildId: packet.d.guild_id,
+                    channelId: packet.d.user_id,
+                    messageId: packet.d.user_id,
+                    guildId: packet.d.user_id,
                     emoji: transformers_1.Emojis.emojiFromRaw(packet.d.emoji),
                     burst: packet.d.burst,
                     type: packet.d.type,
@@ -608,7 +582,46 @@ class Shard {
                 break;
         }
     }
-    onWebSocketOpen() { }
+    onWebSocketOpen(reconnect) {
+        if (reconnect) {
+            this.resume({
+                token: this.client.token,
+                sessionId: this.sessionId,
+                seq: this.sequence,
+            });
+        }
+        else {
+            this.identify({
+                token: this.client.token,
+                properties: {
+                    os: this.client.properties?.os ?? process.platform,
+                    browser: this.client.properties?.browser ?? pkg.name,
+                    device: this.client.properties?.device ?? pkg.name,
+                },
+                compress: this.client.compress,
+                largeThreshold: this.client.largeThreshold,
+                shard: [this.id, this.client.shardsCount],
+                presence: this.client.presence !== undefined
+                    ? {
+                        since: this.client.presence.status === constants_1.StatusTypes.Idle
+                            ? Date.now()
+                            : null,
+                        activities: this.client.presence.activities?.map((activity) => ({
+                            name: activity.type === constants_1.ActivityType.Custom
+                                ? "Custom Status"
+                                : activity.name,
+                            type: activity.type,
+                            url: activity.url,
+                            state: activity.state,
+                        })),
+                        status: this.client.presence.status ?? constants_1.StatusTypes.Online,
+                        afk: !!this.client.presence.afk,
+                    }
+                    : undefined,
+                intents: this.client.intents,
+            });
+        }
+    }
     onWebSocketMessage(data) {
         const packet = JSON.parse(data.toString());
         switch (packet.op) {
@@ -618,31 +631,25 @@ class Shard {
             case constants_1.GatewayOPCodes.Reconnect:
                 {
                     this.client.emit("reconnect");
-                    this.disconnect(this.client.reconnect);
+                    this.reconnect();
                 }
                 break;
             case constants_1.GatewayOPCodes.InvalidSession:
                 {
                     this.client.emit("invalidSession");
                     if (packet.d) {
-                        this.resume();
+                        this.reconnect();
                     }
-                    else {
-                        this.sequence = null;
-                        this.sessionId = null;
-                        this.identify();
+                    else if (this.ws) {
+                        this.ws.close(1000, "Invalid Session - Identify required");
+                        this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", this.client.ws);
+                        this.connect(false);
                     }
                 }
                 break;
             case constants_1.GatewayOPCodes.Hello:
                 {
-                    this.heartbeatInterval = setInterval(() => this.manager.heartbeat(this.sequence), packet.d.heartbeat_interval);
-                    if (this.sessionId && this.sequence && this.resumeGatewayURL) {
-                        this.resume();
-                    }
-                    else {
-                        this.identify();
-                    }
+                    this.heartbeatInterval = setInterval(() => this.heartbeat(null), packet.d.heartbeat_interval);
                     this.client.emit("hello", packet.d.heartbeat_interval, this.id);
                 }
                 break;
@@ -655,9 +662,9 @@ class Shard {
         throw err;
     }
     onWebSocketClose(code, reason) {
-        let reconnect = false;
         switch (code) {
             case 1000:
+                this.disconnect();
                 break;
             case constants_1.GatewayCloseEventCodes.UnknownError:
             case constants_1.GatewayCloseEventCodes.UnknownOPCode:
@@ -667,19 +674,95 @@ class Shard {
             case constants_1.GatewayCloseEventCodes.InvalidSequence:
             case constants_1.GatewayCloseEventCodes.RateLimited:
             case constants_1.GatewayCloseEventCodes.SessionTimedOut:
-                reconnect = this.client.reconnect;
+                this.reconnect();
                 break;
             default:
+                this.disconnect();
                 throw new utils_1.GatewayError(code, reason.toString());
         }
-        this.disconnect(reconnect);
     }
-    resume() {
-        this.manager.resume({
-            token: this.client.token,
-            sessionId: this.sessionId,
-            seq: this.sequence,
-        });
+    /** https://discord.com/developers/docs/events/gateway#resuming */
+    reconnect() {
+        if (this.ws && this.resumeGatewayURL && this.sessionId && this.sequence) {
+            this.ws.close(1000, "Resume Attempt - Reconnect");
+            this.ws = new ws_1.default(this.resumeGatewayURL, this.client.ws);
+            this.connect(true);
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
+    requestGuildMembers(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.RequestGuildMembers,
+                d: {
+                    guild_id: options.guildId,
+                    query: options.query,
+                    limit: options.limit,
+                    presences: options.presences,
+                    user_ids: options.userIds,
+                    nonce: options.nonce,
+                },
+            }));
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#request-soundboard-sounds */
+    requestSoundboardSounds(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.RequestSoundboardSounds,
+                d: {
+                    guild_ids: options.guildIds,
+                },
+            }));
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#resume */
+    resume(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.Resume,
+                d: {
+                    token: options.token,
+                    session_id: options.sessionId,
+                    seq: options.seq,
+                },
+            }));
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
+    updatePresence(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.PresenceUpdate,
+                d: {
+                    since: options.status === constants_1.StatusTypes.Idle ? Date.now() : null,
+                    activities: options.activities?.map((activity) => ({
+                        name: activity.type === constants_1.ActivityType.Custom
+                            ? "Custom Status"
+                            : activity.name,
+                        type: activity.type,
+                        url: activity.url,
+                        state: activity.state,
+                    })),
+                    status: options.status ?? constants_1.StatusTypes.Online,
+                    afk: !!options.afk,
+                },
+            }));
+        }
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
+    updateVoiceState(options) {
+        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+            this.ws.send(JSON.stringify({
+                op: constants_1.GatewayOPCodes.VoiceStateUpdate,
+                d: {
+                    guild_id: options.guildId,
+                    channel_id: options.channelId,
+                    self_mute: options.selfMute,
+                    self_deaf: options.selfDeaf,
+                },
+            }));
+        }
     }
 }
 exports.Shard = Shard;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disgroove",
-    "version": "3.0.0-dev.950983e",
+    "version": "2.2.7",
     "description": "A module to interface with Discord",
     "main": "./dist/lib/index.js",
     "types": "./dist/lib/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "disgroove",
-  "version": "3.0.0-dev.950983e",
+  "version": "3.0.0-dev.97f3796",
   "description": "A module to interface with Discord",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",

package/dist/lib/gateway/WebSocketManager.d.ts

@@ -1,22 +0,0 @@
-import WebSocket from "ws";
-import { GatewayOPCodes } from "../constants";
-import { GatewayPresenceUpdate, GatewayVoiceStateUpdate, Identify, RequestGuildMembers, RequestSoundboardSounds, Resume } from "../types/gateway-events";
-export declare class WebSocketManager {
-    private ws;
-    constructor(ws: WebSocket | null);
-    send(op: GatewayOPCodes, data: unknown): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
-    heartbeat(lastSequence: number | null): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#identify */
-    identify(options: Identify): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
-    requestGuildMembers(options: RequestGuildMembers): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#request-soundboard-sounds */
-    requestSoundboardSounds(options: RequestSoundboardSounds): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#resume */
-    resume(options: Resume): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
-    updatePresence(options: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>): void;
-    /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
-    updateVoiceState(options: GatewayVoiceStateUpdate): void;
-}

package/dist/lib/gateway/WebSocketManager.js

@@ -1,93 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketManager = void 0;
-const ws_1 = __importDefault(require("ws"));
-const constants_1 = require("../constants");
-class WebSocketManager {
-    ws;
-    constructor(ws) {
-        this.ws = ws;
-    }
-    send(op, data) {
-        if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
-            this.ws.send(JSON.stringify({
-                op,
-                d: data,
-            }));
-        }
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
-    heartbeat(lastSequence) {
-        this.send(constants_1.GatewayOPCodes.Heartbeat, lastSequence);
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#identify */
-    identify(options) {
-        this.send(constants_1.GatewayOPCodes.Identify, {
-            token: options.token,
-            properties: {
-                os: options.properties.os,
-                browser: options.properties.browser,
-                device: options.properties.device,
-            },
-            compress: options.compress,
-            large_threshold: options.largeThreshold,
-            shard: options.shard,
-            presence: options.presence,
-            intents: options.intents,
-        });
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
-    requestGuildMembers(options) {
-        this.send(constants_1.GatewayOPCodes.RequestGuildMembers, {
-            guild_id: options.guildId,
-            query: options.query,
-            limit: options.limit,
-            presences: options.presences,
-            user_ids: options.userIds,
-            nonce: options.nonce,
-        });
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#request-soundboard-sounds */
-    requestSoundboardSounds(options) {
-        this.send(constants_1.GatewayOPCodes.RequestSoundboardSounds, {
-            guild_ids: options.guildIds,
-        });
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#resume */
-    resume(options) {
-        this.send(constants_1.GatewayOPCodes.Resume, {
-            token: options.token,
-            session_id: options.sessionId,
-            seq: options.seq,
-        });
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
-    updatePresence(options) {
-        this.send(constants_1.GatewayOPCodes.PresenceUpdate, {
-            since: options.status === constants_1.StatusTypes.Idle ? Date.now() : null,
-            activities: options.activities?.map((activity) => ({
-                name: activity.type === constants_1.ActivityType.Custom
-                    ? "Custom Status"
-                    : activity.name,
-                type: activity.type,
-                url: activity.url,
-                state: activity.state,
-            })),
-            status: options.status ?? constants_1.StatusTypes.Online,
-            afk: !!options.afk,
-        });
-    }
-    /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
-    updateVoiceState(options) {
-        this.send(constants_1.GatewayOPCodes.VoiceStateUpdate, {
-            guild_id: options.guildId,
-            channel_id: options.channelId,
-            self_mute: options.selfMute,
-            self_deaf: options.selfDeaf,
-        });
-    }
-}
-exports.WebSocketManager = WebSocketManager;