disgroove 2.2.2-dev.23938d8 → 2.2.2-dev.db6cb16

package/README.md

@@ -26,7 +26,9 @@ const {
   MessageFlags,
 } = require("disgroove");
 const client = new Client("B0t.T0k3N", {
-  intents: GatewayIntents.All,
+  gateway: {
+    intents: GatewayIntents.All,
+  },
 });
 
 client.once("ready", () => {

package/dist/lib/Client.d.ts

@@ -28,14 +28,23 @@ import type { Sticker, StickerPack } from "./types/sticker";
 import type { User, ApplicationRoleConnection, Connection } from "./types/user";
 import type { VoiceRegion, VoiceState } from "./types/voice";
 import type { Webhook } from "./types/webhook";
-import { VoiceConnectionManager } from "./voice";
+import type { ClientOptions as WebSocketOptions } from "ws";
 export interface ClientOptions {
-    intents?: number | Array<number>;
     shardsCount?: number | "auto";
     auth?: "Bot" | "Bearer";
+    gateway?: {
+        intents?: number | Array<number>;
+        compress?: boolean;
+        largeThreshold?: number;
+        presence?: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>;
+    };
+    ws?: WebSocketOptions;
 }
 export declare class Client extends EventEmitter {
     token: string;
+    compress?: boolean;
+    largeThreshold?: number;
+    presence?: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>;
     intents: GatewayIntents | number;
     shardsCount: number | "auto";
     auth: "Bot" | "Bearer";
@@ -43,10 +52,10 @@ export declare class Client extends EventEmitter {
     rest: RequestManager;
     util: Util;
     guildShardMap: Record<string, number>;
-    user: User;
+    user: User | null;
     guilds: Map<string, Guild>;
-    application: Pick<Application, "id" | "flags">;
-    voiceConnections: VoiceConnectionManager;
+    application: Pick<Application, "id" | "flags"> | null;
+    ws?: WebSocketOptions;
     constructor(token: string, options?: ClientOptions);
     /** https://discord.com/developers/docs/resources/channel#group-dm-add-recipient */
     addGroupRecipient(channelID: snowflake, userID: snowflake, options: {
@@ -70,7 +79,6 @@ export declare class Client extends EventEmitter {
         days: number;
         computePruneCount: boolean;
         includeRoles: Array<snowflake>;
-        reason?: string;
     }, reason?: string): Promise<{
         pruned: number;
     }>;
@@ -1003,7 +1011,7 @@ export declare class Client extends EventEmitter {
     /** https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records */
     updateApplicationRoleConnectionMetadataRecords(applicationID: snowflake): Promise<Array<ApplicationRoleConnectionMetadata>>;
     /** https://discord.com/developers/docs/resources/user#update-current-user-application-role-connection */
-    updateCurrentApplicationRoleConnection(options: {
+    updateCurrentApplicationRoleConnection(applicationID: snowflake, options: {
         platformName?: string;
         platformUsername?: string;
         metadata?: ApplicationRoleConnectionMetadata;

package/dist/lib/Client.js

@@ -9,9 +9,11 @@ const utils_1 = require("./utils");
 const rest_1 = require("./rest");
 const node_events_1 = __importDefault(require("node:events"));
 const gateway_1 = require("./gateway");
-const voice_1 = require("./voice");
 class Client extends node_events_1.default {
     token;
+    compress;
+    largeThreshold;
+    presence;
     intents;
     shardsCount;
     auth;
@@ -22,15 +24,22 @@ class Client extends node_events_1.default {
     user;
     guilds;
     application;
-    voiceConnections;
+    ws;
     constructor(token, options) {
         super();
         this.token = token;
+        this.compress = options?.gateway?.compress;
+        this.largeThreshold = options?.gateway?.largeThreshold;
+        this.presence = {
+            activities: options?.gateway?.presence?.activities,
+            status: options?.gateway?.presence?.status ?? constants_1.StatusTypes.Online,
+            afk: !!options?.gateway?.presence?.afk,
+        };
         this.intents =
-            options?.intents !== undefined
-                ? Array.isArray(options.intents)
-                    ? options.intents.reduce((sum, num) => sum + num, 0)
-                    : options.intents
+            options?.gateway?.intents !== undefined
+                ? Array.isArray(options.gateway.intents)
+                    ? options.gateway.intents.reduce((sum, num) => sum + num, 0)
+                    : options.gateway.intents
                 : constants_1.GatewayIntents.AllNonPrivileged;
         this.shardsCount = options?.shardsCount ?? "auto";
         this.auth = options?.auth ?? "Bot";
@@ -38,8 +47,10 @@ 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.user = null;
         this.guilds = new Map();
-        this.voiceConnections = new voice_1.VoiceConnectionManager();
+        this.application = null;
+        this.ws = options?.ws;
     }
     /** https://discord.com/developers/docs/resources/channel#group-dm-add-recipient */
     addGroupRecipient(channelID, userID, options) {
@@ -80,7 +91,6 @@ class Client extends node_events_1.default {
                 days: options.days,
                 compute_prune_count: options.computePruneCount,
                 include_roles: options.includeRoles,
-                reason: options.reason,
             },
             reason,
         });
@@ -1990,9 +2000,9 @@ 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[guildID])?.updateVoiceState({
-            guildID: guildID,
-            channelID: channelID,
+        this.shards.get(this.guildShardMap[guildID]).updateVoiceState({
+            guildID,
+            channelID,
             selfMute: !!options?.selfMute,
             selfDeaf: !!options?.selfDeaf,
         });
@@ -2007,9 +2017,8 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     leaveVoiceChannel(guildID) {
-        this.voiceConnections.disconnect(guildID);
-        this.shards.get(this.guildShardMap[guildID])?.updateVoiceState({
-            guildID: guildID,
+        this.shards.get(this.guildShardMap[guildID]).updateVoiceState({
+            guildID,
             channelID: null,
             selfMute: false,
             selfDeaf: false,
@@ -2083,8 +2092,8 @@ class Client extends node_events_1.default {
         }));
     }
     /** https://discord.com/developers/docs/resources/user#update-current-user-application-role-connection */
-    async updateCurrentApplicationRoleConnection(options) {
-        const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.userApplicationRoleConnection(this.application.id), {
+    async updateCurrentApplicationRoleConnection(applicationID, options) {
+        const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.userApplicationRoleConnection(applicationID), {
             json: {
                 platform_name: options.platformName,
                 platform_username: options.platformUsername,

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

@@ -6,7 +6,7 @@ export declare class Shard {
     private heartbeatInterval;
     client: Client;
     ws: WebSocket;
-    sessionID: string;
+    sessionID: string | null;
     constructor(id: number, client: Client);
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect(): void;

package/dist/lib/gateway/Shard.js

@@ -39,8 +39,10 @@ class Shard {
     sessionID;
     constructor(id, client) {
         this.id = id;
+        this.heartbeatInterval = null;
         this.client = client;
-        this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json");
+        this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", client.ws);
+        this.sessionID = null;
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect() {
@@ -463,12 +465,6 @@ class Shard {
                 break;
             case "VOICE_SERVER_UPDATE":
                 {
-                    this.client.voiceConnections.connect(packet.d.endpoint, {
-                        serverID: packet.d.guild_id,
-                        userID: this.client.user.id,
-                        sessionID: this.sessionID,
-                        token: packet.d.token,
-                    });
                     this.client.emit(constants_1.GatewayEvents.VoiceServerUpdate, {
                         token: packet.d.token,
                         guildID: packet.d.guild_id,
@@ -502,13 +498,22 @@ class Shard {
     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,
             },
+            compress: this.client.compress,
+            largeThreshold: this.client.largeThreshold,
+            shard: [this.id, this.client.shardsCount],
+            presence: this.client.presence !== undefined
+                ? {
+                    activities: this.client.presence.activities,
+                    status: this.client.presence.status ?? constants_1.StatusTypes.Online,
+                    afk: !!this.client.presence.afk,
+                }
+                : undefined,
+            intents: this.client.intents,
         });
     }
     onWebSocketMessage(data) {

package/dist/lib/index.d.ts

@@ -26,6 +26,5 @@ export * from "./types/user";
 export * from "./types/voice";
 export * from "./types/webhook";
 export * from "./utils";
-export * from "./voice";
 export * from "./Client";
 export * from "./constants";

package/dist/lib/index.js

@@ -42,6 +42,5 @@ __exportStar(require("./types/user"), exports);
 __exportStar(require("./types/voice"), exports);
 __exportStar(require("./types/webhook"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./voice"), exports);
 __exportStar(require("./Client"), exports);
 __exportStar(require("./constants"), exports);

package/dist/lib/rest/RequestManager.d.ts

@@ -12,7 +12,7 @@ export interface RequestData {
     form?: FormData;
     files?: Array<File> | null;
     reason?: string;
-    query?: Partial<Record<string, string | number | boolean | Array<string>>>;
+    query?: Record<string, any>;
     authorization?: boolean;
 }
 /** https://discord.com/developers/docs/reference#error-messages */

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

@@ -357,7 +357,7 @@ export interface Identify {
     compress?: boolean;
     largeThreshold?: number;
     shard?: [number, number];
-    presence?: GatewayPresenceUpdate;
+    presence?: Partial<Pick<GatewayPresenceUpdate, "activities" | "status" | "afk">>;
     intents: GatewayIntents;
 }
 export interface IdentifyConnectionProperties {

package/dist/package.json

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