disgroove 2.2.1-dev.64c7abc → 2.2.1-dev.d0eed5e

package/dist/lib/Client.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { GatewayIntents, type OAuth2Scopes, type StatusTypes, type ActionTypes, type ImageWidgetStyleOptions, InteractionCallbackType, type MFALevel, type ReactionTypes, type ApplicationCommandTypes, type EventTypes, type TriggerTypes, type ChannelTypes, type VideoQualityModes, type SortOrderTypes, type ForumLayoutTypes, type InviteTargetTypes, type VerificationLevel, type DefaultMessageNotificationLevel, type ExplicitContentFilterLevel, type SystemChannelFlags, type ApplicationFlags, type ApplicationIntegrationTypes, type ChannelFlags, type GuildFeatures, type GuildScheduledEventEntityTypes, type GuildScheduledEventPrivacyLevel, type GuildScheduledEventStatus, type MessageFlags, type OnboardingMode, type PrivacyLevel, type GuildMemberFlags } from "./constants";
+import { GatewayIntents, type OAuth2Scopes, type ActionTypes, type ImageWidgetStyleOptions, InteractionCallbackType, type MFALevel, type ReactionTypes, type ApplicationCommandTypes, type EventTypes, type TriggerTypes, type ChannelTypes, type VideoQualityModes, type SortOrderTypes, type ForumLayoutTypes, type InviteTargetTypes, type VerificationLevel, type DefaultMessageNotificationLevel, type ExplicitContentFilterLevel, type SystemChannelFlags, type ApplicationFlags, type ApplicationIntegrationTypes, type ChannelFlags, type GuildFeatures, type GuildScheduledEventEntityTypes, type GuildScheduledEventPrivacyLevel, type GuildScheduledEventStatus, type MessageFlags, type OnboardingMode, type PrivacyLevel, type GuildMemberFlags } from "./constants";
 import { Util } from "./utils";
 import { RequestManager, type File } from "./rest";
 import EventEmitter from "node:events";
@@ -13,7 +13,7 @@ import type { Channel, Message, FollowedChannel, ThreadMember, Overwrite, Defaul
 import type { LocaleMap, snowflake, timestamp } from "./types/common";
 import type { Emoji } from "./types/emoji";
 import type { Entitlement } from "./types/entitlements";
-import type { Activity, AutoModerationActionExecutionEventFields, ChannelPinsUpdateEventFields, ThreadListSyncEventFields, ThreadMemberUpdateEventExtraFields, ThreadMembersUpdateEventFields, GuildCreateEventExtraFields, GuildAuditLogEntryCreateExtraFields, GuildBanAddEventFields, GuildBanRemoveEventFields, GuildMemberAddEventExtraFields, GuildMemberRemoveEventFields, GuildMemberUpdateEventFields, GuildMembersChunkEventFields, IntegrationCreateEventExtraFields, IntegrationUpdateEventExtraFields, IntegrationDeleteEventFields, InviteCreateEventFields, InviteDeleteEventFields, MessageCreateEventExtraFields, MessageDeleteEventFields, MessageDeleteBulkEventFields, MessageReactionAddEventFields, MessageReactionRemoveEventFields, MessageReactionRemoveAllEventFields, MessageReactionRemoveEmojiEventFields, PresenceUpdateEventFields, TypingStartEventFields, VoiceServerUpdateEventFields, MessagePollVoteAddFields, MessagePollVoteRemoveFields } from "./types/gateway-events";
+import type { AutoModerationActionExecutionEventFields, ChannelPinsUpdateEventFields, ThreadListSyncEventFields, ThreadMemberUpdateEventExtraFields, ThreadMembersUpdateEventFields, GuildCreateEventExtraFields, GuildAuditLogEntryCreateExtraFields, GuildBanAddEventFields, GuildBanRemoveEventFields, GuildMemberAddEventExtraFields, GuildMemberRemoveEventFields, GuildMemberUpdateEventFields, GuildMembersChunkEventFields, IntegrationCreateEventExtraFields, IntegrationUpdateEventExtraFields, IntegrationDeleteEventFields, InviteCreateEventFields, InviteDeleteEventFields, MessageCreateEventExtraFields, MessageDeleteEventFields, MessageDeleteBulkEventFields, MessageReactionAddEventFields, MessageReactionRemoveEventFields, MessageReactionRemoveAllEventFields, MessageReactionRemoveEmojiEventFields, PresenceUpdateEventFields, TypingStartEventFields, VoiceServerUpdateEventFields, MessagePollVoteAddFields, MessagePollVoteRemoveFields, GatewayPresenceUpdate, RawPayload } from "./types/gateway-events";
 import type { Guild, GuildMember, WelcomeScreen, GuildWidgetSettings, Ban, Integration, GuildOnboarding, GuildPreview, GuildWidget, UnavailableGuild, OnboardingPrompt, WelcomeScreenChannel } from "./types/guild";
 import type { GuildScheduledEvent, GuildScheduledEventUser, GuildScheduledEventEntityMetadata } from "./types/guild-scheduled-event";
 import type { GuildTemplate } from "./types/guild-template";
@@ -993,11 +993,7 @@ export declare class Client extends EventEmitter {
         limit?: number;
     }): Promise<Array<GuildMember>>;
     /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
-    setPresence(options: {
-        activities: Array<Pick<Activity, "name" | "type" | "url" | "state">>;
-        status?: StatusTypes;
-        afk?: boolean;
-    }): void;
+    setPresence(options: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>): void;
     /** https://discord.com/developers/docs/resources/guild-template#sync-guild-template */
     syncGuildTemplate(guildId: snowflake, code: string): Promise<GuildTemplate>;
     /** https://discord.com/developers/docs/resources/channel#trigger-typing-indicator */
@@ -1028,6 +1024,7 @@ export declare interface Client extends EventEmitter {
     removeListener<K extends keyof ClientEvents>(eventName: K, listener: (...args: ClientEvents[K]) => void): this;
 }
 export interface ClientEvents {
+    dispatch: [packet: RawPayload];
     hello: [];
     ready: [];
     resumed: [];

package/dist/lib/Client.js

@@ -36,6 +36,7 @@ class Client extends node_events_1.default {
         this.rest = new rest_1.RequestManager(token, this.auth);
         this.util = new utils_1.Util();
         this.guildShardMap = {};
+        this.guilds = new Map();
     }
     /** https://discord.com/developers/docs/resources/channel#group-dm-add-recipient */
     addGroupRecipient(channelId, userId, options) {
@@ -2061,7 +2062,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
     setPresence(options) {
         for (const [id, shard] of this.shards)
-            shard.setPresence(options);
+            shard.updatePresence(options);
     }
     /** https://discord.com/developers/docs/resources/guild-template#sync-guild-template */
     async syncGuildTemplate(guildId, code) {

package/dist/lib/constants.d.ts

@@ -616,6 +616,7 @@ export declare enum StatusTypes {
 }
 /** https://discord.com/developers/docs/topics/gateway-events#receive-events */
 export declare enum GatewayEvents {
+    Dispatch = "dispatch",
     Hello = "hello",
     Ready = "ready",
     Resumed = "resumed",

package/dist/lib/constants.js

@@ -682,6 +682,7 @@ var StatusTypes;
 /** https://discord.com/developers/docs/topics/gateway-events#receive-events */
 var GatewayEvents;
 (function (GatewayEvents) {
+    GatewayEvents["Dispatch"] = "dispatch";
     GatewayEvents["Hello"] = "hello";
     GatewayEvents["Ready"] = "ready";
     GatewayEvents["Resumed"] = "resumed";

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

@@ -1,7 +1,6 @@
 import WebSocket from "ws";
-import { StatusTypes } from "../constants";
 import { Client } from "../Client";
-import type { Activity } from "../types/gateway-events";
+import type { GatewayPresenceUpdate, Identify, RequestGuildMembers, Resume } from "../types/gateway-events";
 export declare class Shard {
     id: number;
     private heartbeatInterval;
@@ -9,17 +8,23 @@ export declare class Shard {
     ws: WebSocket;
     sessionId: string;
     constructor(id: number, client: Client);
-    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
-    setPresence(options: {
-        activities?: Array<Pick<Activity, "name" | "type" | "url" | "state">>;
-        status?: StatusTypes;
-        afk?: boolean;
-    }): void;
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect(): void;
+    /** https://discord.com/developers/docs/topics/gateway#connections */
     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;
+    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
+    requestGuildMembers(options: RequestGuildMembers): 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;
 }

package/dist/lib/gateway/Shard.js

@@ -42,18 +42,6 @@ class Shard {
         this.client = client;
         this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json");
     }
-    /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
-    setPresence(options) {
-        this.ws.send(JSON.stringify({
-            op: constants_1.GatewayOPCodes.PresenceUpdate,
-            d: {
-                since: options.status === constants_1.StatusTypes.Idle ? Date.now() : null,
-                activities: options.activities,
-                status: options.status ?? constants_1.StatusTypes.Online,
-                afk: !!options.afk,
-            },
-        }));
-    }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect() {
         this.ws.on("open", () => this.onWebSocketOpen());
@@ -61,54 +49,46 @@ class Shard {
         this.ws.on("error", (err) => this.onWebSocketError(err));
         this.ws.on("close", (code, reason) => this.onWebSocketClose(code, reason));
     }
+    /** https://discord.com/developers/docs/topics/gateway#connections */
     disconnect() {
         if (this.heartbeatInterval) {
             clearInterval(this.heartbeatInterval);
             this.heartbeatInterval = null;
         }
     }
-    onWebSocketOpen() {
+    /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
+    heartbeat(lastSequence) {
+        this.ws.send(JSON.stringify({
+            op: constants_1.GatewayOPCodes.Heartbeat,
+            d: lastSequence,
+        }));
+    }
+    /** https://discord.com/developers/docs/topics/gateway-events#identify */
+    identify(options) {
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.Identify,
             d: {
-                token: this.client.token,
-                shard: [this.id, this.client.shardsCount],
-                intents: this.client.intents,
+                token: options.token,
                 properties: {
-                    os: process.platform,
-                    browser: pkg.name,
-                    device: pkg.name,
+                    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,
             },
         }));
     }
-    onWebSocketMessage(data) {
-        const packet = JSON.parse(data.toString());
-        switch (packet.op) {
-            case constants_1.GatewayOPCodes.Reconnect:
-                this.client.emit(constants_1.GatewayEvents.Reconnect);
-                break;
-            case constants_1.GatewayOPCodes.InvalidSession:
-                this.client.emit(constants_1.GatewayEvents.InvalidSession);
-                break;
-            case constants_1.GatewayOPCodes.Hello:
-                {
-                    this.heartbeatInterval = setInterval(() => {
-                        this.ws.send(JSON.stringify({
-                            op: constants_1.GatewayOPCodes.Heartbeat,
-                            d: null,
-                        }));
-                    }, packet.d.heartbeat_interval);
-                    this.client.emit(constants_1.GatewayEvents.Hello);
-                }
-                break;
-        }
+    onDispatch(packet) {
+        this.client.emit(constants_1.GatewayEvents.Dispatch, packet);
         switch (packet.t) {
             case "READY":
                 {
                     this.sessionId = packet.d.session_id;
                     this.client.user = this.client.util.userFromRaw(packet.d.user);
-                    this.client.guilds = new Map();
                     this.client.application = packet.d.application;
                     this.client.emit(constants_1.GatewayEvents.Ready);
                 }
@@ -511,6 +491,38 @@ class Shard {
                 break;
         }
     }
+    onWebSocketOpen() {
+        this.identify({
+            token: this.client.token,
+            shard: [this.id, this.client.shardsCount],
+            intents: this.client.intents,
+            properties: {
+                os: process.platform,
+                browser: pkg.name,
+                device: pkg.name,
+            },
+        });
+    }
+    onWebSocketMessage(data) {
+        const packet = JSON.parse(data.toString());
+        switch (packet.op) {
+            case constants_1.GatewayOPCodes.Dispatch:
+                this.onDispatch(packet);
+                break;
+            case constants_1.GatewayOPCodes.Reconnect:
+                this.client.emit(constants_1.GatewayEvents.Reconnect);
+                break;
+            case constants_1.GatewayOPCodes.InvalidSession:
+                this.client.emit(constants_1.GatewayEvents.InvalidSession);
+                break;
+            case constants_1.GatewayOPCodes.Hello:
+                {
+                    this.heartbeatInterval = setInterval(() => this.heartbeat(null), packet.d.heartbeat_interval);
+                    this.client.emit(constants_1.GatewayEvents.Hello);
+                }
+                break;
+        }
+    }
     onWebSocketError(err) {
         throw err;
     }
@@ -519,5 +531,42 @@ class Shard {
             return;
         throw new utils_1.GatewayError(`[${code}] ${reason}`);
     }
+    /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
+    requestGuildMembers(options) {
+        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#resume */
+    resume(options) {
+        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) {
+        this.ws.send(JSON.stringify({
+            op: constants_1.GatewayOPCodes.PresenceUpdate,
+            d: {
+                since: options.status === constants_1.StatusTypes.Idle ? Date.now() : null,
+                activities: options.activities,
+                status: options.status ?? constants_1.StatusTypes.Online,
+                afk: !!options.afk,
+            },
+        }));
+    }
 }
 exports.Shard = Shard;

package/dist/lib/types/gateway-events.d.ts

@@ -1,4 +1,4 @@
-import type { ActivityFlags, ActivityType, GuildMemberFlags, InviteTargetTypes, ReactionTypes, StatusTypes, TriggerTypes } from "../constants";
+import type { ActivityFlags, ActivityType, GatewayIntents, GatewayOPCodes, GuildMemberFlags, InviteTargetTypes, ReactionTypes, StatusTypes, TriggerTypes } from "../constants";
 import type { RawApplication, Application } from "./application";
 import type { RawAutoModerationAction, AutoModerationAction } from "./auto-moderation";
 import type { RawChannel, RawThreadMember, Channel, ThreadMember } from "./channel";
@@ -9,6 +9,51 @@ import type { RawGuildScheduledEvent, GuildScheduledEvent } from "./guild-schedu
 import type { RawStageInstance, StageInstance } from "./stage-instance";
 import type { RawUser, RawAvatarDecorationData, User, AvatarDecorationData } from "./user";
 import type { RawVoiceState, VoiceState } from "./voice";
+/** https://discord.com/developers/docs/topics/gateway-events#payload-structure */
+export interface RawPayload {
+    op: GatewayOPCodes;
+    d: any | null;
+    s: number | null;
+    t: string | null;
+}
+/** https://discord.com/developers/docs/topics/gateway-events#identify-identify-structure */
+export interface RawIdentify {
+    token: string;
+    properties: RawIdentifyConnectionProperties;
+    compress?: boolean;
+    large_threshold?: number;
+    shard?: [number, number];
+    presence?: RawGatewayPresenceUpdate;
+    intents: GatewayIntents;
+}
+/** https://discord.com/developers/docs/topics/gateway-events#identify-identify-connection-properties */
+export interface RawIdentifyConnectionProperties {
+    os: string;
+    browser: string;
+    device: string;
+}
+/** https://discord.com/developers/docs/topics/gateway-events#resume-resume-structure */
+export interface RawResume {
+    token: string;
+    session_id: string;
+    seq: number;
+}
+/** https://discord.com/developers/docs/topics/gateway-events#request-guild-members-request-guild-members-structure */
+export interface RawRequestGuildMembers {
+    guild_id: snowflake;
+    query?: string;
+    limit?: number;
+    presences?: boolean;
+    user_ids?: snowflake | Array<snowflake>;
+    nonce?: string;
+}
+/** https://discord.com/developers/docs/topics/gateway-events#update-presence-gateway-presence-update-structure */
+export interface RawGatewayPresenceUpdate {
+    since: number | null;
+    activities: Array<Pick<RawActivity, "name" | "type" | "url" | "state">>;
+    status: StatusTypes;
+    afk: boolean;
+}
 /** https://discord.com/developers/docs/topics/gateway-events#auto-moderation-action-execution-auto-moderation-action-execution-event-fields */
 export interface RawAutoModerationActionExectionEventFields {
     guild_id: snowflake;
@@ -293,6 +338,45 @@ export interface RawMessagePollVoteRemoveFields {
     guild_id?: snowflake;
     answer_id: number;
 }
+export interface Payload {
+    op: GatewayOPCodes;
+    d: any | null;
+    s: number | null;
+    t: string | null;
+}
+export interface Identify {
+    token: string;
+    properties: IdentifyConnectionProperties;
+    compress?: boolean;
+    largeThreshold?: number;
+    shard?: [number, number];
+    presence?: GatewayPresenceUpdate;
+    intents: GatewayIntents;
+}
+export interface IdentifyConnectionProperties {
+    os: string;
+    browser: string;
+    device: string;
+}
+export interface Resume {
+    token: string;
+    sessionId: string;
+    seq: number;
+}
+export interface RequestGuildMembers {
+    guildId: snowflake;
+    query?: string;
+    limit?: number;
+    presences?: boolean;
+    userIds?: snowflake | Array<snowflake>;
+    nonce?: string;
+}
+export interface GatewayPresenceUpdate {
+    since: number | null;
+    activities: Array<Pick<Activity, "name" | "type" | "url" | "state">>;
+    status: StatusTypes;
+    afk: boolean;
+}
 export interface AutoModerationActionExecutionEventFields {
     guildId: snowflake;
     action: AutoModerationAction;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disgroove",
-    "version": "2.2.1-dev.64c7abc",
+    "version": "2.2.1-dev.d0eed5e",
     "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": "2.2.1-dev.64c7abc",
+  "version": "2.2.1-dev.d0eed5e",
   "description": "A module to interface with Discord",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",