disgroove 3.0.0-dev.bc90599 → 3.0.0-dev.fd521a8

package/dist/lib/Client.js

@@ -165,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) {

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

@@ -5,14 +5,17 @@ export declare class Shard {
     id: number;
     private heartbeatInterval;
     client: Client;
-    ws: WebSocket;
+    ws: WebSocket | null;
     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(): 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;
     /** https://discord.com/developers/docs/topics/gateway-events#identify */

package/dist/lib/gateway/Shard.js

@@ -39,31 +39,51 @@ class Shard {
     ws;
     sessionId;
     resumeGatewayURL;
+    sequence;
     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", 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() {
-        this.ws.on("open", () => this.onWebSocketOpen());
+    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));
         this.ws.on("close", (code, reason) => this.onWebSocketClose(code, reason));
     }
     /** 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);
+        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.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#heartbeat */
     heartbeat(lastSequence) {
+        if (!this.ws)
+            return;
         this.ws.send(JSON.stringify({
             op: constants_1.GatewayOPCodes.Heartbeat,
             d: lastSequence,
@@ -71,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: {
@@ -89,12 +111,13 @@ class Shard {
         }));
     }
     onDispatch(packet) {
+        this.sequence = packet.s;
         this.client.emit("dispatch", packet, this.id);
         switch (packet.t) {
             case constants_1.GatewayEvents.Ready:
                 {
                     this.sessionId = packet.d.session_id;
-                    this.resumeGatewayURL = packet.d.resume_gateway_url;
+                    this.resumeGatewayURL = `${packet.d.resume_gateway_url}?v=10&encoding=json`;
                     this.client.user = transformers_1.Users.userFromRaw(packet.d.user);
                     this.client.application = packet.d.application;
                     this.client.emit("ready");
@@ -557,36 +580,45 @@ class Shard {
                 break;
         }
     }
-    onWebSocketOpen() {
-        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,
-        });
+    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());
@@ -595,10 +627,23 @@ class Shard {
                 this.onDispatch(packet);
                 break;
             case constants_1.GatewayOPCodes.Reconnect:
-                this.client.emit("reconnect");
+                {
+                    this.client.emit("reconnect");
+                    this.reconnect();
+                }
                 break;
             case constants_1.GatewayOPCodes.InvalidSession:
-                this.client.emit("invalidSession");
+                {
+                    this.client.emit("invalidSession");
+                    if (packet.d) {
+                        this.reconnect();
+                    }
+                    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:
                 {
@@ -615,12 +660,27 @@ class Shard {
         throw err;
     }
     onWebSocketClose(code, reason) {
-        if (code === 1000)
-            return;
-        throw new utils_1.GatewayError(code, reason.toString());
+        switch (code) {
+            case 1000:
+                break;
+            case constants_1.GatewayCloseEventCodes.UnknownError:
+            case constants_1.GatewayCloseEventCodes.UnknownOPCode:
+            case constants_1.GatewayCloseEventCodes.DecodeError:
+            case constants_1.GatewayCloseEventCodes.NotAuthenticated:
+            case constants_1.GatewayCloseEventCodes.AlreadyAuthenticated:
+            case constants_1.GatewayCloseEventCodes.InvalidSequence:
+            case constants_1.GatewayCloseEventCodes.RateLimited:
+            case constants_1.GatewayCloseEventCodes.SessionTimedOut:
+                this.reconnect();
+                break;
+            default:
+                throw new utils_1.GatewayError(code, reason.toString());
+        }
     }
     /** 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: {
@@ -635,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: {
@@ -644,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: {
@@ -655,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: {
@@ -674,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

@@ -103,5 +103,111 @@ class Applications {
             custom_install_url: application.customInstallURL,
         };
     }
+    static partialApplicationFromRaw(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 !== undefined
+                ? application.team !== null
+                    ? Teams_1.Teams.teamFromRaw(application.team)
+                    : null
+                : undefined,
+            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 partialApplicationToRaw(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 !== undefined
+                ? application.team !== null
+                    ? Teams_1.Teams.teamToRaw(application.team)
+                    : null
+                : undefined,
+            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,
+        };
+    }
 }
 exports.Applications = Applications;

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