disgroove 3.0.0-dev.a714eda → 3.0.0-dev.fd521a8

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

@@ -5,7 +5,7 @@ export declare class Shard {
     id: number;
     private heartbeatInterval;
     client: Client;
-    ws: WebSocket;
+    ws: WebSocket | null;
     sessionId: string | null;
     resumeGatewayURL: string | null;
     sequence: number | null;
@@ -14,6 +14,7 @@ export declare class Shard {
     connect(reconnect: boolean): void;
     /** https://discord.com/developers/docs/events/gateway#initiating-a-disconnect */
     disconnect(): void;
+    /** https://discord.com/developers/docs/events/gateway#resuming */
     reconnect(): void;
     /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
     heartbeat(lastSequence: number | null): void;

package/dist/lib/gateway/Shard.js

@@ -44,13 +44,15 @@ class Shard {
         this.id = id;
         this.heartbeatInterval = null;
         this.client = client;
-        this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", client.ws);
+        this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", this.client.ws);
         this.sessionId = null;
         this.resumeGatewayURL = null;
         this.sequence = null;
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect(reconnect) {
+        if (!this.ws)
+            return;
         this.ws.on("open", () => this.onWebSocketOpen(reconnect));
         this.ws.on("message", (data) => this.onWebSocketMessage(data));
         this.ws.on("error", (err) => this.onWebSocketError(err));
@@ -58,16 +60,21 @@ class Shard {
     }
     /** https://discord.com/developers/docs/events/gateway#initiating-a-disconnect */
     disconnect() {
+        if (!this.ws)
+            return;
         if (this.heartbeatInterval) {
             clearInterval(this.heartbeatInterval);
             this.heartbeatInterval = null;
         }
-        this.ws.close(1000, "Session Invalidated - Disconnect");
+        if (this.ws.readyState !== ws_1.default.CLOSED) {
+            this.ws.removeAllListeners();
+            this.ws.close(1000, "Session Invalidated - Disconnect");
+            this.ws = null;
+        }
     }
+    /** https://discord.com/developers/docs/events/gateway#resuming */
     reconnect() {
-        if (this.resumeGatewayURL !== null &&
-            this.sessionId !== null &&
-            this.sequence !== null) {
+        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);
@@ -75,6 +82,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#heartbeat */
     heartbeat(lastSequence) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.Heartbeat,
             d: lastSequence,
@@ -82,6 +91,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#identify */
     identify(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.Identify,
             d: {
@@ -627,7 +638,7 @@ class Shard {
                     if (packet.d) {
                         this.reconnect();
                     }
-                    else {
+                    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);
@@ -668,6 +679,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
     requestGuildMembers(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.RequestGuildMembers,
             d: {
@@ -682,6 +695,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#request-soundboard-sounds */
     requestSoundboardSounds(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.RequestSoundboardSounds,
             d: {
@@ -691,6 +706,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#resume */
     resume(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.Resume,
             d: {
@@ -702,6 +719,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
     updatePresence(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.PresenceUpdate,
             d: {
@@ -721,6 +740,8 @@ class Shard {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     updateVoiceState(options) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.VoiceStateUpdate,
             d: {

package/dist/lib/transformers/Applications.d.ts

@@ -2,4 +2,6 @@ import type { RawApplication, Application } from "../types/application";
 export declare class Applications {
     static applicationFromRaw(application: RawApplication): Application;
     static applicationToRaw(application: Application): RawApplication;
+    static partialApplicationFromRaw(application: Partial<RawApplication>): Partial<Application>;
+    static partialApplicationToRaw(application: Partial<Application>): Partial<RawApplication>;
 }

package/dist/lib/transformers/Applications.js

@@ -6,6 +6,104 @@ const Teams_1 = require("./Teams");
 const Users_1 = require("./Users");
 class Applications {
     static applicationFromRaw(application) {
+        return {
+            id: application.id,
+            name: application.name,
+            icon: application.icon,
+            description: application.description,
+            rpcOrigins: application.rpc_origins,
+            botPublic: application.bot_public,
+            botRequireCodeGrant: application.bot_require_code_grant,
+            termsOfServiceURL: application.terms_of_service_url,
+            privacyPolicyURL: application.privacy_policy_url,
+            owner: application.owner !== undefined
+                ? Users_1.Users.userFromRaw(application.owner)
+                : undefined,
+            verifyKey: application.verify_key,
+            team: application.team !== null ? Teams_1.Teams.teamFromRaw(application.team) : null,
+            guildId: application.guild_id,
+            guild: application.guild !== undefined
+                ? Guilds_1.Guilds.guildFromRaw(application.guild)
+                : undefined,
+            primarySKUId: application.primary_sku_id,
+            slug: application.slug,
+            coverImage: application.cover_image,
+            flags: application.flags,
+            approximateGuildCount: application.approximate_guild_count,
+            approximateUserInstallCount: application.approximate_user_install_count,
+            approximateUserAuthorizationCount: application.approximate_user_authorization_count,
+            redirectURIs: application.redirect_uris,
+            interactionsEndpointURL: application.interactions_endpoint_url,
+            roleConnectionsVerificationURL: application.role_connections_verification_url,
+            eventWebhooksURL: application.event_webhooks_url,
+            eventWebhooksStatus: application.event_webhooks_status,
+            eventWebhooksTypes: application.event_webhooks_types,
+            tags: application.tags,
+            installParams: application.install_params,
+            integrationTypesConfig: application.integration_types_config !== undefined
+                ? {
+                    "0": {
+                        oauth2InstallParams: application.integration_types_config?.[0]
+                            .oauth2_install_params,
+                    },
+                    "1": {
+                        oauth2InstallParams: application.integration_types_config?.[1]
+                            .oauth2_install_params,
+                    },
+                }
+                : undefined,
+            customInstallURL: application.custom_install_url,
+        };
+    }
+    static applicationToRaw(application) {
+        return {
+            id: application.id,
+            name: application.name,
+            icon: application.icon,
+            description: application.description,
+            rpc_origins: application.rpcOrigins,
+            bot_public: application.botPublic,
+            bot_require_code_grant: application.botRequireCodeGrant,
+            terms_of_service_url: application.termsOfServiceURL,
+            privacy_policy_url: application.privacyPolicyURL,
+            owner: application.owner !== undefined
+                ? Users_1.Users.userToRaw(application.owner)
+                : undefined,
+            verify_key: application.verifyKey,
+            team: application.team !== null ? Teams_1.Teams.teamToRaw(application.team) : null,
+            guild_id: application.guildId,
+            guild: application.guild !== undefined
+                ? Guilds_1.Guilds.guildToRaw(application.guild)
+                : undefined,
+            primary_sku_id: application.primarySKUId,
+            slug: application.slug,
+            cover_image: application.coverImage,
+            flags: application.flags,
+            approximate_guild_count: application.approximateGuildCount,
+            approximate_user_install_count: application.approximateUserInstallCount,
+            approximate_user_authorization_count: application.approximateUserAuthorizationCount,
+            redirect_uris: application.redirectURIs,
+            interactions_endpoint_url: application.interactionsEndpointURL,
+            role_connections_verification_url: application.roleConnectionsVerificationURL,
+            event_webhooks_url: application.eventWebhooksURL,
+            event_webhooks_status: application.eventWebhooksStatus,
+            event_webhooks_types: application.eventWebhooksTypes,
+            tags: application.tags,
+            install_params: application.installParams,
+            integration_types_config: application.integrationTypesConfig !== undefined
+                ? {
+                    "0": {
+                        oauth2_install_params: application.integrationTypesConfig?.[0].oauth2InstallParams,
+                    },
+                    "1": {
+                        oauth2_install_params: application.integrationTypesConfig?.[1].oauth2InstallParams,
+                    },
+                }
+                : undefined,
+            custom_install_url: application.customInstallURL,
+        };
+    }
+    static partialApplicationFromRaw(application) {
         return {
             id: application.id,
             name: application.name,
@@ -59,7 +157,7 @@ class Applications {
             customInstallURL: application.custom_install_url,
         };
     }
-    static applicationToRaw(application) {
+    static partialApplicationToRaw(application) {
         return {
             id: application.id,
             name: application.name,

package/dist/lib/transformers/Messages.js

@@ -226,7 +226,7 @@ class Messages {
             type: message.type,
             activity: message.activity,
             application: message.application !== undefined
-                ? Applications_1.Applications.applicationFromRaw(message.application)
+                ? Applications_1.Applications.partialApplicationFromRaw(message.application)
                 : undefined,
             applicationId: message.application_id,
             flags: message.flags,
@@ -334,7 +334,7 @@ class Messages {
             type: message.type,
             activity: message.activity,
             application: message.application !== undefined
-                ? Applications_1.Applications.applicationToRaw(message.application)
+                ? Applications_1.Applications.partialApplicationToRaw(message.application)
                 : undefined,
             application_id: message.applicationId,
             flags: message.flags,

package/dist/lib/types/application.d.ts

@@ -16,7 +16,7 @@ export interface RawApplication {
     privacy_policy_url?: string;
     owner?: RawUser;
     verify_key: string;
-    team?: RawTeam | null;
+    team: RawTeam | null;
     guild_id?: snowflake;
     guild?: RawGuild;
     primary_sku_id?: snowflake;
@@ -74,7 +74,7 @@ export interface Application {
     privacyPolicyURL?: string;
     owner?: User;
     verifyKey: string;
-    team?: Team | null;
+    team: Team | null;
     guildId?: snowflake;
     guild?: Guild;
     primarySKUId?: snowflake;

package/dist/lib/types/message.d.ts

@@ -29,7 +29,7 @@ export interface RawMessage {
     webhook_id?: snowflake;
     type: MessageTypes;
     activity?: RawMessageActivity;
-    application?: RawApplication;
+    application?: Partial<RawApplication>;
     application_id?: snowflake;
     flags?: MessageFlags;
     message_reference?: RawMessageReference;
@@ -228,7 +228,7 @@ export interface Message {
     webhookId?: snowflake;
     type: MessageTypes;
     activity?: MessageActivity;
-    application?: Application;
+    application?: Partial<Application>;
     applicationId?: snowflake;
     flags?: MessageFlags;
     messageReference?: MessageReference;

package/dist/package.json

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