feat(ClientOptions): waitGuildTimeout amount client option

src/client/Client.js

@@ -567,6 +567,9 @@ class Client extends BaseClient {
     if (!Array.isArray(options.partials)) {
       throw new TypeError('CLIENT_INVALID_OPTION', 'partials', 'an Array');
     }
+    if (typeof options.fetchGuildTimeout !== 'number' || isNaN(options.fetchGuildTimeout)) {
+      throw new TypeError('CLIENT_INVALID_OPTION', 'fetchGuildTimeout', 'a number');
+    }
     if (typeof options.restWsBridgeTimeout !== 'number' || isNaN(options.restWsBridgeTimeout)) {
       throw new TypeError('CLIENT_INVALID_OPTION', 'restWsBridgeTimeout', 'a number');
     }

src/client/websocket/WebSocketShard.js

@@ -475,12 +475,20 @@ class WebSocketShard extends EventEmitter {
       return;
     }
     const hasGuildsIntent = new Intents(this.manager.client.options.intents).has(Intents.FLAGS.GUILDS);
-    // Step 2. Create a 15s timeout that will mark the shard as ready if there are still unavailable guilds
+    // Step 2. Create a timeout that will mark the shard as ready if there are still unavailable guilds
+    // * the timeout should be 15 seconds by default
+    // * this can be optionally be changed in the client options via fetchGuildTimeout
+    // * a timeout time of zero will skip this timeout
+
+    const guildTimeoutAmount = this.manager.client.options.fetchGuildTimeout ?? 15000;
+
     this.readyTimeout = setTimeout(
       () => {
         this.debug(
           `Shard ${hasGuildsIntent ? 'did' : 'will'} not receive any more guild packets` +
-            `${hasGuildsIntent ? ' in 15 seconds' : ''}.\n   Unavailable guild count: ${this.expectedGuilds.size}`,
+            `${hasGuildsIntent ? ` in ${guildTimeoutAmount} ms` : ''}.\nUnavailable guild count: ${
+              this.expectedGuilds.size
+            }`,
         );
 
         this.readyTimeout = null;
@@ -489,7 +497,7 @@ class WebSocketShard extends EventEmitter {
 
         this.emit(ShardEvents.ALL_READY, this.expectedGuilds);
       },
-      hasGuildsIntent ? 15000 : 0,
+      hasGuildsIntent ? guildTimeoutAmount : 0,
     ).unref();
   }
 

src/util/Options.js

@@ -69,6 +69,9 @@
  * [User Agent](https://discord.com/developers/docs/reference#user-agent) header
  * @property {PresenceData} [presence={}] Presence data to use upon login
  * @property {IntentsResolvable} intents Intents to enable for this connection
+ * @property {number} [fetchGuildTimeout=15000] Time in milliseconds that Clients with the GUILDS intent should hang
+ * and wait for missing guilds to be recieved before starting the bot.
+ * If not specified, the default is 15 seconds.
  * @property {WebsocketOptions} [ws] Options for the WebSocket
  * @property {HTTPOptions} [http] HTTP options
  */
@@ -124,6 +127,7 @@ class Options extends null {
       failIfNotExists: true,
       userAgentSuffix: [],
       presence: {},
+      fetchGuildTimeout: 15000,
       ws: {
         large_threshold: 50,
         compress: false,

typings/index.d.ts

@@ -3342,6 +3342,7 @@ export interface ClientOptions {
   userAgentSuffix?: string[];
   presence?: PresenceData;
   intents: BitFieldResolvable<IntentsString, number>;
+  fetchGuildTimeout?: number;
   ws?: WebSocketOptions;
   http?: HTTPOptions;
   rejectOnRateLimit?: string[] | ((data: RateLimitData) => boolean | Promise<boolean>);