@discordeno/gateway 19.0.0-next.b0c482b → 19.0.0-next.b2f65c2

package/dist/Shard.d.ts

@@ -1,6 +1,6 @@
 import type { AtLeastOne, BigString, Camelize, DiscordGatewayPayload, DiscordMember, RequestGuildMembers } from '@discordeno/types';
-import { Collection } from '@discordeno/utils';
-import WebSocket from 'ws';
+import { Collection, LeakyBucket } from '@discordeno/utils';
+import NodeWebSocket from 'ws';
 import type { RequestMemberRequest } from './manager.js';
 import type { BotStatusUpdate, ShardEvents, ShardGatewayConfig, ShardHeart, ShardSocketRequest, StatusUpdate, UpdateVoiceState } from './types.js';
 import { ShardState } from './types.js';
@@ -20,7 +20,7 @@ export declare class DiscordenoShard {
     /** Current session id of the shard if present. */
     sessionId?: string;
     /** This contains the WebSocket connection to Discord, if currently connected. */
-    socket?: WebSocket;
+    socket?: NodeWebSocket;
     /** Current internal state of the this. */
     state: ShardState;
     /** The url provided by discord to use when resuming a connection for this this. */
@@ -32,7 +32,7 @@ export declare class DiscordenoShard {
     /** Resolve internal waiting states. Mapped by SelectedEvents => ResolveFunction */
     resolves: Map<"READY" | "RESUMED" | "INVALID_SESSION", (payload: DiscordGatewayPayload) => void>;
     /** Shard bucket. Only access this if you know what you are doing. Bucket for handling shard request rate limits. */
-    bucket: import("@discordeno/utils").LeakyBucket;
+    bucket: LeakyBucket;
     /** This managers cache related settings. */
     cache: {
         requestMembers: {
@@ -48,6 +48,8 @@ export declare class DiscordenoShard {
     constructor(options: ShardCreateOptions);
     /** The gateway configuration which is used to connect to Discord. */
     get gatewayConfig(): ShardGatewayConfig;
+    /** The url to connect to. Intially this is the discord gateway url, and then is switched to resume gateway url once a READY is received. */
+    get connectionUrl(): string;
     /** Calculate the amount of requests which can safely be made per rate limit interval, before the gateway gets disconnected due to an exceeded rate limit. */
     calculateSafeRequests(): number;
     checkOffline(highPriority: boolean): Promise<void>;
@@ -68,11 +70,12 @@ export declare class DiscordenoShard {
     /** Shutdown the this. Forcefully disconnect the shard from Discord. The shard may not attempt to reconnect with Discord. */
     shutdown(): Promise<void>;
     /** Handle a gateway connection close. */
-    handleClose(close: WebSocket.CloseEvent): Promise<void>;
+    handleClose(close: NodeWebSocket.CloseEvent): Promise<void>;
     /** Handles a incoming gateway packet. */
     handleDiscordPacket(packet: DiscordGatewayPayload): Promise<void>;
+    forwardToBot(packet: DiscordGatewayPayload): void;
     /** Handle an incoming gateway message. */
-    handleMessage(message: WebSocket.MessageEvent): Promise<void>;
+    handleMessage(message: NodeWebSocket.MessageEvent): Promise<void>;
     /**
      * Override in order to make the shards presence.
      * async in case devs create the presence based on eg. database values.
@@ -81,6 +84,8 @@ export declare class DiscordenoShard {
     makePresence(): Promise<BotStatusUpdate | undefined>;
     /** This function communicates with the management process, in order to know whether its free to identify. When this function resolves, this means that the shard is allowed to send an identify payload to discord. */
     requestIdentify(): Promise<void>;
+    /** This function communicates with the management process, in order to tell it can identify the next shard. */
+    shardIsReady(): Promise<void>;
     /** Start sending heartbeat payloads to Discord in the provided interval. */
     startHeartbeating(interval: number): void;
     /** Stop the heartbeating process with discord. */
@@ -163,6 +168,8 @@ export interface ShardCreateOptions {
     events: ShardEvents;
     /** The handler to request a space to make an identify request. */
     requestIdentify?: () => Promise<void>;
+    /** The handler to alert the gateway manager that this shard has received a READY event. */
+    shardIsReady?: () => Promise<void>;
 }
 export default DiscordenoShard;
 //# sourceMappingURL=Shard.d.ts.map

package/dist/Shard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/Shard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/Shard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EACT,QAAQ,EACR,qBAAqB,EAGrB,aAAa,EAEb,mBAAmB,EACpB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,UAAU,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAA;AAEpF,OAAO,aAAa,MAAM,IAAI,CAAA;AAC9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,kBAAkB,EAAE,UAAU,EAAE,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClJ,OAAO,EAAyB,UAAU,EAAE,MAAM,YAAY,CAAA;AAI9D,qBAAa,eAAe;IAC1B,0BAA0B;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,qFAAqF;IACrF,UAAU,EAAE,kBAAkB,CAAA;IAC9B,kDAAkD;IAClD,KAAK,EAAE,UAAU,CAAA;IACjB,4HAA4H;IAC5H,2BAA2B,EAAE,MAAM,CAAM;IACzC,4CAA4C;IAC5C,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAO;IAC5C,8EAA8E;IAC9E,sBAAsB,EAAE,MAAM,CAAQ;IACtC,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iFAAiF;IACjF,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,0CAA0C;IAC1C,KAAK,aAAqB;IAC1B,mFAAmF;IACnF,gBAAgB,EAAE,MAAM,CAAK;IAC7B,wCAAwC;IACxC,MAAM,EAAE,WAAW,CAAK;IACxB,qGAAqG;IACrG,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC,CAAK;IACnD,mFAAmF;IACnF,QAAQ,yDAA8D,qBAAqB,KAAK,IAAI,EAAG;IACvG,oHAAoH;IACpH,MAAM,EAAE,WAAW,CAAA;IAEnB,4CAA4C;IAC5C,KAAK;;YAED;;;eAGG;;YAEH,4BAA4B;;;MAG/B;gBAEW,OAAO,EAAE,kBAAkB;IAoBvC,qEAAqE;IACrE,IAAI,aAAa,IAAI,kBAAkB,CAEtC;IAED,4IAA4I;IAC5I,IAAI,aAAa,IAAI,MAAM,CAG1B;IAED,6JAA6J;IAC7J,qBAAqB,IAAI,MAAM;IAOzB,YAAY,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxD,yDAAyD;IACzD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzC,kHAAkH;IAC5G,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAoCzC,4GAA4G;IACtG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD/B,iEAAiE;IACjE,MAAM,IAAI,OAAO;IAIjB,sEAAsE;IAChE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD7B;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,4HAA4H;IACtH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,yCAAyC;IACnC,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA+DjE,yCAAyC;IACnC,mBAAmB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4JvE,YAAY,CAAC,MAAM,EAAE,qBAAqB,GAAG,IAAI;IAMjD,0CAA0C;IACpC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAevE;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAK1D,uNAAuN;IACjN,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtC,+GAA+G;IACzG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAEnC,4EAA4E;IAC5E,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IA4EzC,kDAAkD;IAClD,gBAAgB,IAAI,IAAI;IAQxB;;;;;;;;;;;;;;OAcG;IACG,gBAAgB,CACpB,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,WAAW,CAAC,CAAC,GACpE,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;;OAMG;IACG,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACG,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAiD5H;;;;;;;;;;;OAWG;IACG,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAY3D;AAED,MAAM,WAAW,kBAAkB;IACjC,mBAAmB;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,6BAA6B;IAC7B,UAAU,EAAE,kBAAkB,CAAA;IAC9B,kDAAkD;IAClD,MAAM,EAAE,WAAW,CAAA;IACnB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,2FAA2F;IAC3F,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACnC;AAED,eAAe,eAAe,CAAA"}

package/dist/Shard.js

@@ -1,32 +1,27 @@
-import { GatewayCloseEventCodes, GatewayIntents, GatewayOpcodes } from '@discordeno/types';
-import { camelize, Collection, createLeakyBucket, delay, logger } from '@discordeno/utils';
+/* eslint-disable @typescript-eslint/no-confusing-void-expression */ import { GatewayCloseEventCodes, GatewayIntents, GatewayOpcodes } from '@discordeno/types';
+import { Collection, LeakyBucket, camelize, delay, logger } from '@discordeno/utils';
 import { inflateSync } from 'node:zlib';
-import WebSocket from 'ws';
+import NodeWebSocket from 'ws';
 import { ShardSocketCloseCodes, ShardState } from './types.js';
 export class DiscordenoShard {
-    /** The maximum of requests which can be send to discord per rate limit tick. Typically this value should not be changed. */ maxRequestsPerRateLimitTick = 120;
-    /** The previous payload sequence number. */ previousSequenceNumber = null;
-    /** In which interval (in milliseconds) the gateway resets it's rate limit. */ rateLimitResetInterval = 60000;
-    /** Current internal state of the this. */ state = ShardState.Offline;
-    /** The url provided by discord to use when resuming a connection for this this. */ resumeGatewayUrl = '';
-    /** The shard related event handlers. */ events = {};
-    /** Cache for pending gateway requests which should have been send while the gateway went offline. */ offlineSendQueue = [];
-    /** Resolve internal waiting states. Mapped by SelectedEvents => ResolveFunction */ resolves = new Map();
-    /** Shard bucket. Only access this if you know what you are doing. Bucket for handling shard request rate limits. */ bucket = createLeakyBucket({
-        max: 120,
-        refillInterval: 60000,
-        refillAmount: 120
-    });
-    /** This managers cache related settings. */ cache = {
-        requestMembers: {
-            /**
+    constructor(options){
+        /** The maximum of requests which can be send to discord per rate limit tick. Typically this value should not be changed. */ this.maxRequestsPerRateLimitTick = 120;
+        /** The previous payload sequence number. */ this.previousSequenceNumber = null;
+        /** In which interval (in milliseconds) the gateway resets it's rate limit. */ this.rateLimitResetInterval = 60000;
+        /** Current internal state of the this. */ this.state = ShardState.Offline;
+        /** The url provided by discord to use when resuming a connection for this this. */ this.resumeGatewayUrl = '';
+        /** The shard related event handlers. */ this.events = {};
+        /** Cache for pending gateway requests which should have been send while the gateway went offline. */ this.offlineSendQueue = [];
+        /** Resolve internal waiting states. Mapped by SelectedEvents => ResolveFunction */ this.resolves = new Map();
+        /** This managers cache related settings. */ this.cache = {
+            requestMembers: {
+                /**
        * Whether or not request member requests should be cached.
        * @default false
        */ enabled: false,
-            /** The pending requests. */ pending: new Collection()
-        }
-    };
-    constructor(options){
+                /** The pending requests. */ pending: new Collection()
+            }
+        };
         this.id = options.id;
         this.connection = options.connection;
         this.events = options.events;
@@ -35,10 +30,20 @@ export class DiscordenoShard {
             interval: 45000
         };
         if (options.requestIdentify) this.requestIdentify = options.requestIdentify;
+        if (options.shardIsReady) this.shardIsReady = options.shardIsReady;
+        this.bucket = new LeakyBucket({
+            max: this.calculateSafeRequests(),
+            refillAmount: this.calculateSafeRequests(),
+            refillInterval: 60000
+        });
     }
     /** The gateway configuration which is used to connect to Discord. */ get gatewayConfig() {
         return this.connection;
     }
+    /** The url to connect to. Intially this is the discord gateway url, and then is switched to resume gateway url once a READY is received. */ get connectionUrl() {
+        // Use || and not ?? here. ?? will cause a bug.
+        return this.resumeGatewayUrl || this.gatewayConfig.url;
+    }
     /** Calculate the amount of requests which can safely be made per rate limit interval, before the gateway gets disconnected due to an exceeded rate limit. */ calculateSafeRequests() {
         // * 2 adds extra safety layer for discords OP 1 requests that we need to respond to
         const safeRequests = this.maxRequestsPerRateLimitTick - Math.ceil(this.rateLimitResetInterval / this.heart.interval) * 2;
@@ -54,8 +59,8 @@ export class DiscordenoShard {
         }
     }
     /** Close the socket connection to discord if present. */ close(code, reason) {
-        if (this.socket?.readyState !== WebSocket.OPEN) return;
-        return this.socket?.close(code, reason);
+        if (this.socket?.readyState !== NodeWebSocket.OPEN) return;
+        this.socket?.close(code, reason);
     }
     /** Connect the shard with the gateway and start heartbeating. This will not identify the shard to the gateway. */ async connect() {
         // Only set the shard to `Connecting` state,
@@ -67,20 +72,16 @@ export class DiscordenoShard {
             this.state = ShardState.Connecting;
         }
         this.events.connecting?.(this);
-        let url = new URL(this.gatewayConfig.url);
-        // If not connecting to a proxy but directly to discord need to handle resuming
-        if (url.origin === 'wss://gateway.discord.gg') {
-            if (this.state === ShardState.Resuming) {
-                url = new URL(this.resumeGatewayUrl);
-            }
-            url.searchParams.set('v', this.gatewayConfig.version.toString());
-            url.searchParams.set('encoding', 'json');
-        }
-        const socket = new WebSocket(url.toString());
+        const url = new URL(this.connectionUrl);
+        url.searchParams.set('v', this.gatewayConfig.version.toString());
+        url.searchParams.set('encoding', 'json');
+        const socket = // @ts-expect-error Deno
+        globalThis.Deno !== undefined && Reflect.has(globalThis, 'Deno') ? new WebSocket(url.toString()) : new NodeWebSocket(url.toString());
         this.socket = socket;
         // TODO: proper event handling
         socket.onerror = (event)=>console.log({
-                error: event
+                error: event,
+                shardId: this.id
             });
         socket.onclose = async (event)=>await this.handleClose(event);
         socket.onmessage = async (message)=>await this.handleMessage(message);
@@ -114,8 +115,6 @@ export class DiscordenoShard {
         if (!this.isOpen()) {
             await this.connect();
         }
-        // Wait until an identify is free for this this.
-        await this.requestIdentify();
         this.send({
             op: GatewayOpcodes.Identify,
             d: {
@@ -133,6 +132,8 @@ export class DiscordenoShard {
         return await new Promise((resolve)=>{
             this.resolves.set('READY', ()=>{
                 this.events.identified?.(this);
+                // Tells the manager that this shard is ready
+                this.shardIsReady();
                 resolve();
             });
             // When identifying too fast,
@@ -145,27 +146,27 @@ export class DiscordenoShard {
         });
     }
     /** Check whether the connection to Discord is currently open. */ isOpen() {
-        return this.socket?.readyState === WebSocket.OPEN;
+        return this.socket?.readyState === NodeWebSocket.OPEN;
     }
     /** Attempt to resume the previous shards session with the gateway. */ async resume() {
-        //   gateway.debug("GW RESUMING", { shardId });
+        logger.debug(`[Gateway] Resuming Shard #${this.id}`);
         // It has been requested to resume the Shards session.
         // It's possible that the shard is still connected with Discord's gateway therefore we need to forcefully close it.
         if (this.isOpen()) {
+            logger.debug(`[Gateway] Resuming Shard #${this.id} in isOpen`);
             this.close(ShardSocketCloseCodes.ResumeClosingOldConnection, 'Reconnecting the shard, closing old connection.');
         }
         // Shard has never identified, so we cannot resume.
         if (!this.sessionId) {
-            // gateway.debug(
-            //   "GW DEBUG",
-            //   `[Error] Trying to resume a shard (id: ${shardId}) that was not first identified.`,
-            // );
+            logger.debug(`[Shard] Trying to resume a shard #${this.id} that was NOT first identified. (No session id found)`);
             return await this.identify();
-        // throw new Error(`[SHARD] Trying to resume a shard (id: ${this.id}) which was never identified`);
         }
         this.state = ShardState.Resuming;
+        logger.debug(`[Gateway] Resuming Shard #${this.id}, before connecting`);
         // Before we can resume, we need to create a new connection with Discord's gateway.
         await this.connect();
+        logger.debug(// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        `[Gateway] Resuming Shard #${this.id}, after connecting. ${this.gatewayConfig.token} | ${this.sessionId} | ${this.previousSequenceNumber}`);
         this.send({
             op: GatewayOpcodes.Resume,
             d: {
@@ -174,6 +175,7 @@ export class DiscordenoShard {
                 seq: this.previousSequenceNumber ?? 0
             }
         }, true);
+        logger.debug(`[Gateway] Resuming Shard #${this.id} after send resumg`);
         return await new Promise((resolve)=>{
             this.resolves.set('RESUMED', ()=>resolve());
             // If it is attempted to resume with an invalid session id,
@@ -191,7 +193,7 @@ export class DiscordenoShard {
         // Before acquiring a token from the bucket, check whether the shard is currently offline or not.
         // Else bucket and token wait time just get wasted.
         await this.checkOffline(highPriority);
-        await this.bucket.acquire(1, highPriority);
+        await this.bucket.acquire(highPriority);
         // It's possible, that the shard went offline after a token has been acquired from the bucket.
         await this.checkOffline(highPriority);
         this.socket?.send(JSON.stringify(message));
@@ -229,6 +231,7 @@ export class DiscordenoShard {
             case GatewayCloseEventCodes.RateLimited:
             case GatewayCloseEventCodes.SessionTimedOut:
                 {
+                    logger.debug(`[Shard] Gateway connection closing requiring re-identify. Code: ${close.code}`);
                     this.state = ShardState.Identifying;
                     this.events.disconnected?.(this);
                     return await this.identify();
@@ -252,6 +255,7 @@ export class DiscordenoShard {
             case GatewayCloseEventCodes.AlreadyAuthenticated:
             default:
                 {
+                    logger.info(`[Shard] closed shard #${this.id}. Resuming...`);
                     this.state = ShardState.Resuming;
                     this.events.disconnected?.(this);
                     return await this.resume();
@@ -285,18 +289,22 @@ export class DiscordenoShard {
             case GatewayOpcodes.Hello:
                 {
                     const interval = packet.d.heartbeat_interval;
+                    logger.debug(`[Gateway] Hello on Shard #${this.id}`);
                     this.startHeartbeating(interval);
                     if (this.state !== ShardState.Resuming) {
+                        const currentQueue = [
+                            ...this.bucket.queue
+                        ];
                         // HELLO has been send on a non resume action.
                         // This means that the shard starts a new session,
                         // therefore the rate limit interval has been reset too.
-                        this.bucket = createLeakyBucket({
+                        this.bucket = new LeakyBucket({
                             max: this.calculateSafeRequests(),
                             refillInterval: 60000,
-                            refillAmount: this.calculateSafeRequests(),
-                            // Waiting acquires should not be lost on a re-identify.
-                            waiting: this.bucket.waiting
+                            refillAmount: this.calculateSafeRequests()
                         });
+                        // Queue should not be lost on a re-identify.
+                        this.bucket.queue.unshift(...currentQueue);
                     }
                     this.events.hello?.(this);
                     break;
@@ -315,8 +323,8 @@ export class DiscordenoShard {
                 }
             case GatewayOpcodes.InvalidSession:
                 {
-                    //   gateway.debug("GW INVALID_SESSION", { shardId, payload: packet });
                     const resumable = packet.d;
+                    logger.debug(`[Shard] Received Invalid Session for Shard #${this.id} with resumeable as ${resumable.toString()}`);
                     this.events.invalidSession?.(this, resumable);
                     // We need to wait for a random amount of time between 1 and 5
                     // Reference: https://discord.com/developers/docs/topics/gateway#resuming
@@ -325,7 +333,7 @@ export class DiscordenoShard {
                     this.resolves.delete('INVALID_SESSION');
                     // When resumable is false we need to re-identify
                     if (!resumable) {
-                        await this.identify();
+                        await this.requestIdentify();
                         break;
                     }
                     // The session is invalid but apparently it is resumable
@@ -333,25 +341,49 @@ export class DiscordenoShard {
                     break;
                 }
         }
-        if (packet.t === 'RESUMED') {
-            // gateway.debug("GW RESUMED", { shardId });
-            this.state = ShardState.Connected;
-            this.events.resumed?.(this);
-            // Continue the requests which have been queued since the shard went offline.
-            this.offlineSendQueue.map((resolve)=>resolve());
-            this.resolves.get('RESUMED')?.(packet);
-            this.resolves.delete('RESUMED');
-        } else if (packet.t === 'READY') {
-            // Important for future resumes.
-            const payload = packet.d;
-            this.resumeGatewayUrl = payload.resume_gateway_url;
-            this.sessionId = payload.session_id;
-            this.state = ShardState.Connected;
-            // Continue the requests which have been queued since the shard went offline.
-            // Important when this is a re-identify
-            this.offlineSendQueue.map((resolve)=>resolve());
-            this.resolves.get('READY')?.(packet);
-            this.resolves.delete('READY');
+        switch(packet.t){
+            case 'RESUMED':
+                this.state = ShardState.Connected;
+                this.events.resumed?.(this);
+                // Continue the requests which have been queued since the shard went offline.
+                this.offlineSendQueue.map((resolve)=>resolve());
+                this.resolves.get('RESUMED')?.(packet);
+                this.resolves.delete('RESUMED');
+                break;
+            case 'READY':
+                {
+                    // Important for future resumes.
+                    const payload = packet.d;
+                    this.resumeGatewayUrl = payload.resume_gateway_url;
+                    this.sessionId = payload.session_id;
+                    this.state = ShardState.Connected;
+                    // Continue the requests which have been queued since the shard went offline.
+                    // Important when this is a re-identify
+                    this.offlineSendQueue.map((resolve)=>resolve());
+                    this.resolves.get('READY')?.(packet);
+                    this.resolves.delete('READY');
+                    break;
+                }
+            case 'GUILD_MEMBERS_CHUNK':
+                {
+                    // If it's not enabled skip checks.
+                    if (!this.cache.requestMembers.enabled) break;
+                    const payload = packet.d;
+                    // If this request has non nonce, skip checks.
+                    if (!payload.nonce) break;
+                    const pending = this.cache.requestMembers.pending.get(payload.nonce);
+                    if (!pending) break;
+                    // If this is not the final chunk, just save to cache.
+                    if (payload.chunk_index + 1 < payload.chunk_count) {
+                        pending.members.push(...payload.members);
+                        break;
+                    }
+                    // Resolve the promise that all requests are done.
+                    pending.resolve(camelize(pending.members));
+                    // Delete the cache to clean up once its done.
+                    this.cache.requestMembers.pending.delete(payload.nonce);
+                    break;
+                }
         }
         // Update the sequence number if it is present
         // `s` can be either `null` or a `number`.
@@ -359,6 +391,9 @@ export class DiscordenoShard {
         if (packet.s !== null) {
             this.previousSequenceNumber = packet.s;
         }
+        this.forwardToBot(packet);
+    }
+    forwardToBot(packet) {
         // The necessary handling required for the Shards connection has been finished.
         // Now the event can be safely forwarded.
         this.events.message?.(this, camelize(packet));
@@ -383,8 +418,12 @@ export class DiscordenoShard {
         return;
     }
     /** This function communicates with the management process, in order to know whether its free to identify. When this function resolves, this means that the shard is allowed to send an identify payload to discord. */ async requestIdentify() {}
+    /** This function communicates with the management process, in order to tell it can identify the next shard. */ async shardIsReady() {}
     /** Start sending heartbeat payloads to Discord in the provided interval. */ startHeartbeating(interval) {
-        //   gateway.debug("GW HEARTBEATING_STARTED", { shardId, interval });
+        logger.debug(`[Gateway] Start Heartbeating Shard #${this.id}`);
+        // If old heartbeast exist like after resume, clear the old ones.
+        if (this.heart.intervalId) clearInterval(this.heart.intervalId);
+        if (this.heart.timeoutId) clearTimeout(this.heart.timeoutId);
         this.heart.interval = interval;
         // Only set the shard's state to `Unidentified`
         // if heartbeating has not been started due to an identify or resume action.
@@ -392,6 +431,7 @@ export class DiscordenoShard {
             ShardState.Disconnected,
             ShardState.Offline
         ].includes(this.state)) {
+            logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} a`);
             this.state = ShardState.Unidentified;
         }
         // The first heartbeat needs to be send with a random delay between `0` and `interval`
@@ -400,17 +440,22 @@ export class DiscordenoShard {
         // Reference: https://discord.com/developers/docs/topics/gateway#heartbeating
         const jitter = Math.ceil(this.heart.interval * (Math.random() || 0.5));
         this.heart.timeoutId = setTimeout(()=>{
+            logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} b`);
             if (!this.isOpen()) return;
+            logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} c ${this.previousSequenceNumber}`);
             // Using a direct socket.send call here because heartbeat requests are reserved by us.
             this.socket?.send(JSON.stringify({
                 op: GatewayOpcodes.Heartbeat,
                 d: this.previousSequenceNumber
             }));
+            logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} d`);
             this.heart.lastBeat = Date.now();
             this.heart.acknowledged = false;
             // After the random heartbeat jitter we can start a normal interval.
             this.heart.intervalId = setInterval(async ()=>{
+                logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} e`);
                 if (!this.isOpen()) return;
+                logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} f`);
                 // gateway.debug("GW DEBUG", `Running setInterval in heartbeat file. Shard: ${shardId}`);
                 // gateway.debug("GW HEARTBEATING", { shardId, shard: currentShard });
                 // The Shard did not receive a heartbeat ACK from Discord in time,
@@ -418,15 +463,18 @@ export class DiscordenoShard {
                 // The Shard needs to start a re-identify action accordingly.
                 // Reference: https://discord.com/developers/docs/topics/gateway#heartbeating-example-gateway-heartbeat-ack
                 if (!this.heart.acknowledged) {
+                    logger.debug(`[Shard] Heartbeat not acknowledged for shard #${this.id}.`);
                     this.close(ShardSocketCloseCodes.ZombiedConnection, 'Zombied connection, did not receive an heartbeat ACK in time.');
                     return await this.identify();
                 }
                 this.heart.acknowledged = false;
+                logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} g`);
                 // Using a direct socket.send call here because heartbeat requests are reserved by us.
                 this.socket?.send(JSON.stringify({
                     op: GatewayOpcodes.Heartbeat,
                     d: this.previousSequenceNumber
                 }));
+                logger.debug(`[Gateway] Start Heartbeating Shard #${this.id} h`);
                 this.heart.lastBeat = Date.now();
                 this.events.heartbeat?.(this);
             }, this.heart.interval);
@@ -455,7 +503,7 @@ export class DiscordenoShard {
    * @see {@link https://discord.com/developers/docs/topics/gateway#update-voice-state}
    */ async joinVoiceChannel(guildId, channelId, options) {
         logger.debug(`[Shard] joinVoiceChannel guildId: ${guildId} channelId: ${channelId}`);
-        return await this.send({
+        await this.send({
             op: GatewayOpcodes.VoiceStateUpdate,
             d: {
                 guild_id: guildId.toString(),
@@ -472,7 +520,7 @@ export class DiscordenoShard {
    * @returns Promise<void>
    */ async editBotStatus(data) {
         logger.debug(`[Shard] editBotStatus data: ${JSON.stringify(data)}`);
-        return await this.editShardStatus(data);
+        await this.editShardStatus(data);
     }
     /**
    * Edits the bot's status on one shard.
@@ -482,7 +530,7 @@ export class DiscordenoShard {
    * @returns Promise<void>
    */ async editShardStatus(data) {
         logger.debug(`[Shard] editShardStatus shardId: ${this.id} -> data: ${JSON.stringify(data)}`);
-        return await this.send({
+        await this.send({
             op: GatewayOpcodes.PresenceUpdate,
             d: {
                 since: null,
@@ -524,7 +572,6 @@ export class DiscordenoShard {
             logger.debug(`[Shard] requestMembers guildId: ${guildId} -> setting user limit based on userIds length: ${options.userIds.length}`);
             options.limit = options.userIds.length;
         }
-        const nonce = `${guildId}-${Date.now()}`;
         // Gateway does not require caching these requests so directly send and return
         if (!this.cache.requestMembers?.enabled) {
             logger.debug(`[Shard] requestMembers guildId: ${guildId} -> skipping cache -> options ${JSON.stringify(options)}`);
@@ -537,14 +584,14 @@ export class DiscordenoShard {
                     limit: options?.limit ?? 0,
                     presences: options?.presences ?? false,
                     user_ids: options?.userIds?.map((id)=>id.toString()),
-                    nonce
+                    nonce: options?.nonce
                 }
             });
             return [];
         }
         return await new Promise((resolve)=>{
-            this.cache.requestMembers?.pending.set(nonce, {
-                nonce,
+            if (options?.nonce) this.cache.requestMembers?.pending.set(options.nonce, {
+                nonce: options.nonce,
                 resolve,
                 members: []
             });
@@ -558,7 +605,7 @@ export class DiscordenoShard {
                     limit: options?.limit ?? 0,
                     presences: options?.presences ?? false,
                     user_ids: options?.userIds?.map((id)=>id.toString()),
-                    nonce
+                    nonce: options?.nonce
                 }
             });
         });
@@ -576,7 +623,7 @@ export class DiscordenoShard {
    * @see {@link https://discord.com/developers/docs/topics/gateway#update-voice-state}
    */ async leaveVoiceChannel(guildId) {
         logger.debug(`[Shard] leaveVoiceChannel guildId: ${guildId} Shard ${this.id}`);
-        return await this.send({
+        await this.send({
             op: GatewayOpcodes.VoiceStateUpdate,
             d: {
                 guild_id: guildId.toString(),