seyfert 2.1.0 → 2.1.1-dev-11316886063.0

package/lib/types/utils/index.d.ts

@@ -167,7 +167,11 @@ export declare enum GatewayOpcodes {
     /**
      * Sent in response to receiving a heartbeat to acknowledge that it has been received
      */
-    HeartbeatAck = 11
+    HeartbeatAck = 11,
+    /**
+     * Used to request soundboard sounds for a list of guilds. The server will send Soundboard Sounds events for each guild in response.
+     */
+    RequestSoundboardSounds = 31
 }
 /**
  * https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-close-event-codes
@@ -262,7 +266,7 @@ export declare enum GatewayIntentBits {
      * @deprecated This is the old name for {@apilink GatewayIntentBits#GuildModeration}
      */
     GuildBans = 4,
-    GuildEmojisAndStickers = 8,
+    GuildExpressions = 8,
     GuildIntegrations = 16,
     GuildWebhooks = 32,
     GuildInvites = 64,
@@ -347,6 +351,11 @@ export declare enum GatewayDispatchEvents {
     GuildScheduledEventDelete = "GUILD_SCHEDULED_EVENT_DELETE",
     GuildScheduledEventUserAdd = "GUILD_SCHEDULED_EVENT_USER_ADD",
     GuildScheduledEventUserRemove = "GUILD_SCHEDULED_EVENT_USER_REMOVE",
+    GuildSoundboardSoundCreate = "GUILD_SOUNDBOARD_SOUND_CREATE",
+    GuildSoundboardSoundUpdate = "GUILD_SOUNDBOARD_SOUND_UPDATE",
+    GuildSoundboardSoundDelete = "GUILD_SOUNDBOARD_SOUND_DELETE",
+    GuildSoundboardSoundsUpdate = "GUILD_SOUNDBOARD_SOUNDS_UPDATE",
+    SoundboardSounds = "SOUNDBOARD_SOUNDS",
     AutoModerationRuleCreate = "AUTO_MODERATION_RULE_CREATE",
     AutoModerationRuleUpdate = "AUTO_MODERATION_RULE_UPDATE",
     AutoModerationRuleDelete = "AUTO_MODERATION_RULE_DELETE",

package/lib/types/utils/index.js

@@ -153,6 +153,10 @@ var GatewayOpcodes;
      * Sent in response to receiving a heartbeat to acknowledge that it has been received
      */
     GatewayOpcodes[GatewayOpcodes["HeartbeatAck"] = 11] = "HeartbeatAck";
+    /**
+     * Used to request soundboard sounds for a list of guilds. The server will send Soundboard Sounds events for each guild in response.
+     */
+    GatewayOpcodes[GatewayOpcodes["RequestSoundboardSounds"] = 31] = "RequestSoundboardSounds";
 })(GatewayOpcodes || (exports.GatewayOpcodes = GatewayOpcodes = {}));
 /**
  * https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-close-event-codes
@@ -248,9 +252,8 @@ var GatewayIntentBits;
     /**
      * @deprecated This is the old name for {@apilink GatewayIntentBits#GuildModeration}
      */
-    // biome-ignore lint/correctness/noUndeclaredVariables: no reason lmao
     GatewayIntentBits[GatewayIntentBits["GuildBans"] = 4] = "GuildBans";
-    GatewayIntentBits[GatewayIntentBits["GuildEmojisAndStickers"] = 8] = "GuildEmojisAndStickers";
+    GatewayIntentBits[GatewayIntentBits["GuildExpressions"] = 8] = "GuildExpressions";
     GatewayIntentBits[GatewayIntentBits["GuildIntegrations"] = 16] = "GuildIntegrations";
     GatewayIntentBits[GatewayIntentBits["GuildWebhooks"] = 32] = "GuildWebhooks";
     GatewayIntentBits[GatewayIntentBits["GuildInvites"] = 64] = "GuildInvites";
@@ -336,6 +339,11 @@ var GatewayDispatchEvents;
     GatewayDispatchEvents["GuildScheduledEventDelete"] = "GUILD_SCHEDULED_EVENT_DELETE";
     GatewayDispatchEvents["GuildScheduledEventUserAdd"] = "GUILD_SCHEDULED_EVENT_USER_ADD";
     GatewayDispatchEvents["GuildScheduledEventUserRemove"] = "GUILD_SCHEDULED_EVENT_USER_REMOVE";
+    GatewayDispatchEvents["GuildSoundboardSoundCreate"] = "GUILD_SOUNDBOARD_SOUND_CREATE";
+    GatewayDispatchEvents["GuildSoundboardSoundUpdate"] = "GUILD_SOUNDBOARD_SOUND_UPDATE";
+    GatewayDispatchEvents["GuildSoundboardSoundDelete"] = "GUILD_SOUNDBOARD_SOUND_DELETE";
+    GatewayDispatchEvents["GuildSoundboardSoundsUpdate"] = "GUILD_SOUNDBOARD_SOUNDS_UPDATE";
+    GatewayDispatchEvents["SoundboardSounds"] = "SOUNDBOARD_SOUNDS";
     GatewayDispatchEvents["AutoModerationRuleCreate"] = "AUTO_MODERATION_RULE_CREATE";
     GatewayDispatchEvents["AutoModerationRuleUpdate"] = "AUTO_MODERATION_RULE_UPDATE";
     GatewayDispatchEvents["AutoModerationRuleDelete"] = "AUTO_MODERATION_RULE_DELETE";

package/lib/websocket/SharedTypes.d.ts

@@ -1,6 +1,7 @@
 import type { RestToKeys } from '../common';
-import type { GatewayActivity, PresenceUpdateStatus, GatewayPresenceUpdateData, GatewayRequestGuildMembersDataWithQuery, GatewayRequestGuildMembersDataWithUserIds, APIGuildMember, APIUser, GatewayReadyDispatchData, GatewayChannelUpdateDispatchData, GatewayAutoModerationActionExecutionDispatchData, GatewayThreadCreateDispatchData, GatewayThreadDeleteDispatchData, GatewayThreadListSyncDispatchData, GatewayThreadMemberUpdateDispatchData, GatewayThreadMembersUpdateDispatchData, GatewayChannelPinsUpdateDispatchData, GatewayGuildCreateDispatchData, APIGuild, GatewayGuildDeleteDispatchData, APIAuditLogEntry, GatewayGuildBanAddDispatchData, GatewayGuildBanRemoveDispatchData, GatewayGuildEmojisUpdateDispatchData, GatewayGuildStickersUpdateDispatchData, GatewayGuildIntegrationsUpdateDispatchData, GatewayGuildMemberAddDispatchData, GatewayGuildMemberRemoveDispatchData, GatewayGuildMemberUpdateDispatchData, GatewayGuildMembersChunkDispatchData, GatewayGuildRoleCreateDispatchData, GatewayGuildRoleUpdateDispatchData, GatewayGuildRoleDeleteDispatchData, GatewayIntegrationDeleteDispatchData, GatewayInviteCreateDispatchData, GatewayInviteDeleteDispatchData, GatewayMessageCreateDispatchData, GatewayMessageUpdateDispatchData, GatewayMessageDeleteDispatchData, GatewayMessageDeleteBulkDispatchData, GatewayMessageReactionAddDispatchData, GatewayMessageReactionRemoveDispatchData, GatewayMessageReactionRemoveAllDispatchData, GatewayMessageReactionRemoveEmojiDispatchData, GatewayPresenceUpdateDispatchData, GatewayTypingStartDispatchData, GatewayUserUpdateDispatchData, GatewayVoiceStateUpdateData, GatewayVoiceServerUpdateDispatchData, GatewayWebhooksUpdateDispatchData, GatewayInteractionCreateDispatchData, APIStageInstance, GatewayMessagePollVoteDispatchData, GatewayIntegrationCreateDispatchData, GatewayGuildScheduledEventUserRemoveDispatchData, APIGuildScheduledEvent, APIChannel, APIAutoModerationRule, APIEntitlement, GatewayVoiceChannelEffectSendDispachData, APISubscription, GatewayEntitlementCreateDispatchData } from '../types';
+import type { APIAuditLogEntry, APIAutoModerationRule, APIChannel, APIEntitlement, APIGuild, APIGuildMember, APIGuildScheduledEvent, APIStageInstance, APISubscription, APIUser, GatewayActivity, GatewayAutoModerationActionExecutionDispatchData, GatewayChannelPinsUpdateDispatchData, GatewayChannelUpdateDispatchData, GatewayEntitlementCreateDispatchData, GatewayGuildBanAddDispatchData, GatewayGuildBanRemoveDispatchData, GatewayGuildCreateDispatchData, GatewayGuildDeleteDispatchData, GatewayGuildEmojisUpdateDispatchData, GatewayGuildIntegrationsUpdateDispatchData, GatewayGuildMemberAddDispatchData, GatewayGuildMemberRemoveDispatchData, GatewayGuildMemberUpdateDispatchData, GatewayGuildMembersChunkDispatchData, GatewayGuildRoleCreateDispatchData, GatewayGuildRoleDeleteDispatchData, GatewayGuildRoleUpdateDispatchData, GatewayGuildScheduledEventUserRemoveDispatchData, GatewayGuildSoundboardSoundDeleteDispatchData, GatewayGuildSoundboardSoundsUpdateDispatchData, GatewayGuildStickersUpdateDispatchData, GatewayIntegrationCreateDispatchData, GatewayIntegrationDeleteDispatchData, GatewayInteractionCreateDispatchData, GatewayInviteCreateDispatchData, GatewayInviteDeleteDispatchData, GatewayMessageCreateDispatchData, GatewayMessageDeleteBulkDispatchData, GatewayMessageDeleteDispatchData, GatewayMessagePollVoteDispatchData, GatewayMessageReactionAddDispatchData, GatewayMessageReactionRemoveAllDispatchData, GatewayMessageReactionRemoveDispatchData, GatewayMessageReactionRemoveEmojiDispatchData, GatewayMessageUpdateDispatchData, GatewayPresenceUpdateData, GatewayPresenceUpdateDispatchData, GatewayReadyDispatchData, GatewayRequestGuildMembersDataWithQuery, GatewayRequestGuildMembersDataWithUserIds, GatewaySoundboardSoundsDispatchData, GatewayThreadCreateDispatchData, GatewayThreadDeleteDispatchData, GatewayThreadListSyncDispatchData, GatewayThreadMemberUpdateDispatchData, GatewayThreadMembersUpdateDispatchData, GatewayTypingStartDispatchData, GatewayUserUpdateDispatchData, GatewayVoiceChannelEffectSendDispachData, GatewayVoiceServerUpdateDispatchData, GatewayVoiceStateUpdateData, GatewayWebhooksUpdateDispatchData, PresenceUpdateStatus } from '../types';
 import { GatewayDispatchEvents } from '../types';
+import type { APISoundBoard } from '../types/payloads/soundboard';
 /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
 export interface StatusUpdate {
     /** The user's activities */
@@ -55,6 +56,9 @@ export interface Events {
     [GatewayDispatchEvents.GuildEmojisUpdate]: GatewayGuildEmojisUpdateDispatchData;
     [GatewayDispatchEvents.GuildStickersUpdate]: GatewayGuildStickersUpdateDispatchData;
     [GatewayDispatchEvents.GuildIntegrationsUpdate]: GatewayGuildIntegrationsUpdateDispatchData;
+    [GatewayDispatchEvents.GuildSoundboardSoundsUpdate]: GatewayGuildSoundboardSoundsUpdateDispatchData;
+    [GatewayDispatchEvents.GuildSoundboardSoundDelete]: GatewayGuildSoundboardSoundDeleteDispatchData;
+    [GatewayDispatchEvents.SoundboardSounds]: GatewaySoundboardSoundsDispatchData;
     [GatewayDispatchEvents.GuildMemberAdd]: GatewayGuildMemberAddDispatchData;
     [GatewayDispatchEvents.GuildMemberRemove]: GatewayGuildMemberRemoveDispatchData;
     [GatewayDispatchEvents.GuildMemberUpdate]: GatewayGuildMemberUpdateDispatchData;
@@ -133,7 +137,12 @@ export type SubscriptionEvents = RestToKeys<[
     GatewayDispatchEvents.SubscriptionDelete,
     GatewayDispatchEvents.SubscriptionUpdate
 ]>;
-export type NormalizeEvents = Events & AutoModetaractionRuleEvents & ChannelSameEvents & GuildScheduledSameEvents & GuildScheduledUserSameEvents & IntegrationSameEvents & EntitlementEvents & PollVoteSameEvents & StageSameEvents & SubscriptionEvents & {
+export type SoundboardSoundsEvents = RestToKeys<[
+    APISoundBoard,
+    GatewayDispatchEvents.GuildSoundboardSoundCreate,
+    GatewayDispatchEvents.GuildSoundboardSoundUpdate
+]>;
+export type NormalizeEvents = Events & AutoModetaractionRuleEvents & ChannelSameEvents & GuildScheduledSameEvents & GuildScheduledUserSameEvents & IntegrationSameEvents & EntitlementEvents & PollVoteSameEvents & StageSameEvents & SubscriptionEvents & SoundboardSoundsEvents & {
     RAW: GatewayDispatchEvents;
 };
 export type GatewayEvents = {

package/lib/websocket/constants/index.js

@@ -17,24 +17,14 @@ const ShardManagerDefaults = {
     properties,
     version: 10,
     shardStart: 0,
-    handlePayload: (shardId, packet) => {
-        console.info(`Packet ${packet.t} on shard ${shardId}`);
-    },
     resharding: {
         interval: 8 * 60 * 60 * 1e3, // 8h
         percentage: 80,
-        reloadGuilds() {
-            throw new Error('Unexpected to run <reloadGuilds>');
-        },
-        onGuild() {
-            throw new Error('Unexpected to run <onGuild>');
-        },
     },
 };
 exports.ShardManagerDefaults = ShardManagerDefaults;
 const WorkerManagerDefaults = {
     ...ShardManagerDefaults,
     shardsPerWorker: 16,
-    handlePayload: (_shardId, _workerId, _packet) => { },
 };
 exports.WorkerManagerDefaults = WorkerManagerDefaults;

package/lib/websocket/discord/basesocket.d.ts

@@ -1,7 +1,7 @@
 import { SeyfertWebSocket } from './socket/custom';
 export declare class BaseSocket {
     private internal;
-    ping?: () => Promise<number>;
+    ping: () => Promise<number>;
     constructor(kind: 'ws' | 'bun', url: string);
     set onopen(callback: SeyfertWebSocket['onopen']);
     set onmessage(callback: SeyfertWebSocket['onmessage']);

package/lib/websocket/discord/shard.d.ts

@@ -1,9 +1,9 @@
 import { Logger, type MakeRequired } from '../../common';
+import { type GatewayReceivePayload, type GatewaySendPayload } from '../../types';
 import { DynamicBucket } from '../structures';
 import { ConnectTimeout } from '../structures/timeout';
 import { BaseSocket } from './basesocket';
 import type { ShardData, ShardOptions } from './shared';
-import { type GatewaySendPayload, type GatewayReceivePayload } from '../../types';
 export interface ShardHeart {
     interval: number;
     nodeInterval?: NodeJS.Timeout;

package/lib/websocket/discord/shard.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shard = void 0;
 const node_zlib_1 = require("node:zlib");
 const common_1 = require("../../common");
+const types_1 = require("../../types");
 const constants_1 = require("../constants");
 const structures_1 = require("../structures");
 const timeout_1 = require("../structures/timeout");
 const basesocket_1 = require("./basesocket");
 const shared_1 = require("./shared");
-const types_1 = require("../../types");
 class Shard {
     id;
     logger;
@@ -65,7 +65,6 @@ class Shard {
     ping() {
         if (!this.websocket)
             return Promise.resolve(Number.POSITIVE_INFINITY);
-        //@ts-expect-error
         return this.websocket.ping();
     }
     async connect() {
@@ -171,8 +170,10 @@ class Shard {
                 }
                 break;
             case types_1.GatewayOpcodes.HeartbeatAck:
-                this.heart.ack = true;
-                this.heart.lastAck = Date.now();
+                {
+                    this.heart.ack = true;
+                    this.heart.lastAck = Date.now();
+                }
                 break;
             case types_1.GatewayOpcodes.Heartbeat:
                 this.heartbeat(true);
@@ -197,8 +198,10 @@ class Shard {
                 {
                     switch (packet.t) {
                         case types_1.GatewayDispatchEvents.Resumed:
-                            this.offlineSendQueue.map((resolve) => resolve());
-                            this.options.handlePayload(this.id, packet);
+                            {
+                                this.offlineSendQueue.map((resolve) => resolve());
+                                this.options.handlePayload(this.id, packet);
+                            }
                             break;
                         case types_1.GatewayDispatchEvents.Ready: {
                             this.data.resume_gateway_url = packet.d.resume_gateway_url;
@@ -226,10 +229,12 @@ class Shard {
             case types_1.GatewayCloseCodes.UnknownOpcode:
             case types_1.GatewayCloseCodes.InvalidSeq:
             case types_1.GatewayCloseCodes.SessionTimedOut:
-                this.data.resume_seq = 0;
-                this.data.session_id = undefined;
-                this.data.resume_gateway_url = undefined;
-                await this.reconnect();
+                {
+                    this.data.resume_seq = 0;
+                    this.data.session_id = undefined;
+                    this.data.resume_gateway_url = undefined;
+                    await this.reconnect();
+                }
                 break;
             case 1001:
             case 1006:
@@ -239,8 +244,10 @@ class Shard {
             case types_1.GatewayCloseCodes.NotAuthenticated:
             case types_1.GatewayCloseCodes.AlreadyAuthenticated:
             case types_1.GatewayCloseCodes.RateLimited:
-                this.logger.info('Trying to reconnect');
-                await this.reconnect();
+                {
+                    this.logger.info('Trying to reconnect');
+                    await this.reconnect();
+                }
                 break;
             case types_1.GatewayCloseCodes.AuthenticationFailed:
             case types_1.GatewayCloseCodes.DisallowedIntents:
@@ -251,17 +258,19 @@ class Shard {
                 this.logger.fatal('Cannot reconnect');
                 break;
             default:
-                this.logger.warn('Unknown close code, trying to reconnect anyways');
-                await this.reconnect();
+                {
+                    this.logger.warn('Unknown close code, trying to reconnect anyways');
+                    await this.reconnect();
+                }
                 break;
         }
     }
     async close(code, reason) {
         clearInterval(this.heart.nodeInterval);
         if (!this.isOpen) {
-            return this.debugger?.warn(`[Shard #${this.id}] Is not open`);
+            return this.debugger?.warn(`[Shard #${this.id}] Is not open, reason:`, reason);
         }
-        this.debugger?.debug(`[Shard #${this.id}] Called close`);
+        this.debugger?.debug(`[Shard #${this.id}] Called close with reason:`, reason);
         this.websocket?.close(code, reason);
     }
     handleMessage(data) {

package/lib/websocket/discord/sharder.d.ts

@@ -1,14 +1,15 @@
 import { Logger, type MakeRequired } from '../../common';
-import { type GatewayUpdatePresence, type GatewayVoiceStateUpdate, type GatewaySendPayload } from '../../types';
+import type { MakeDeepPartial } from '../../common/types/util';
+import { type GatewaySendPayload, type GatewayUpdatePresence, type GatewayVoiceStateUpdate } from '../../types';
 import { ShardManagerDefaults } from '../constants';
 import { ConnectQueue } from '../structures/timeout';
 import { Shard } from './shard';
-import type { ShardManagerOptions } from './shared';
+import type { ShardData, ShardManagerOptions } from './shared';
 export declare class ShardManager extends Map<number, Shard> {
     connectQueue: ConnectQueue;
     options: MakeRequired<ShardManagerOptions, keyof typeof ShardManagerDefaults>;
     debugger?: Logger;
-    constructor(options: ShardManagerOptions);
+    constructor(options: MakeDeepPartial<ShardManagerOptions, 'resharding'>);
     get totalShards(): number;
     get shardStart(): number;
     get shardEnd(): number;
@@ -16,15 +17,17 @@ export declare class ShardManager extends Map<number, Shard> {
     get concurrency(): number;
     get latency(): number;
     calculateShardId(guildId: string): number;
-    spawn(shardId: number): Shard;
+    create(shardId: number): Shard;
     spawnShards(): Promise<void>;
+    startResharder(): Promise<void>;
     spawnBuckets(): Shard[][];
     forceIdentify(shardId: number): Promise<void>;
     disconnect(shardId: number): Promise<void> | undefined;
-    disconnectAll(): Promise<unknown>;
+    disconnectAll(): void;
     setShardPresence(shardId: number, payload: GatewayUpdatePresence['d']): void;
-    setPresence(payload: GatewayUpdatePresence['d']): Promise<void>;
+    setPresence(payload: GatewayUpdatePresence['d']): void;
     joinVoice(guild_id: string, channel_id: string, options: Pick<GatewayVoiceStateUpdate['d'], 'self_deaf' | 'self_mute'>): void;
     leaveVoice(guild_id: string): void;
     send<T extends GatewaySendPayload>(shardId: number, payload: T): void;
+    resume(shardId: number, shardData: MakeRequired<ShardData>): unknown;
 }

package/lib/websocket/discord/sharder.js

@@ -31,64 +31,6 @@ class ShardManager extends Map {
             if (worker_threads.parentPort)
                 parentPort = worker_threads.parentPort;
         }
-        if (this.options.resharding.interval <= 0)
-            return;
-        setInterval(async () => {
-            this.debugger?.debug('Checking if reshard is needed');
-            const info = await this.options.resharding.getInfo();
-            if (info.shards <= this.totalShards)
-                return this.debugger?.debug('Resharding not needed');
-            //https://github.com/discordeno/discordeno/blob/6a5f446c0651b9fad9f1550ff1857fe7a026426b/packages/gateway/src/manager.ts#L106C8-L106C94
-            const percentage = (info.shards / ((this.totalShards * 2500) / 1000)) * 100;
-            if (percentage < this.options.resharding.percentage)
-                return this.debugger?.debug(`Percentage is not enough to reshard ${percentage}/${this.options.resharding.percentage}`);
-            this.debugger?.info('Starting resharding process');
-            this.connectQueue.concurrency = info.session_start_limit.max_concurrency;
-            this.options.totalShards = info.shards;
-            this.options.info.session_start_limit.max_concurrency = info.session_start_limit.max_concurrency;
-            let shardsConnected = 0;
-            let handlePayload = async (sharder, _, packet) => {
-                if ((packet.t === 'GUILD_CREATE' || packet.t === 'GUILD_DELETE') &&
-                    this.options.resharding.onGuild(packet.d.id)) {
-                    return;
-                }
-                if (packet.t !== 'READY')
-                    return;
-                this.options.resharding.reloadGuilds(packet.d.guilds.map(x => x.id));
-                if (++shardsConnected < info.shards)
-                    return; //waiting for last shard to connect
-                // dont listen more events when all shards are ready
-                handlePayload = async () => { };
-                await this.disconnectAll();
-                this.clear();
-                for (const [id, shard] of sharder) {
-                    shard.options.handlePayload = (shardId, packet) => {
-                        return this.options.handlePayload(shardId, packet);
-                    };
-                    this.set(id, shard);
-                }
-                sharder.clear();
-            };
-            const resharder = new ShardManager({
-                ...this.options,
-                resharding: {
-                    // getInfo mock, we don't need it
-                    getInfo: () => ({}),
-                    interval: 0,
-                    percentage: 0,
-                    reloadGuilds() { },
-                    onGuild() {
-                        return true;
-                    },
-                },
-                handlePayload: (shardId, packet) => {
-                    return handlePayload(resharder, shardId, packet);
-                },
-            });
-            // share ratelimit
-            resharder.connectQueue = this.connectQueue;
-            await resharder.spawnShards();
-        }, this.options.resharding.interval);
     }
     get totalShards() {
         return this.options.totalShards ?? this.options.info.shards;
@@ -113,8 +55,8 @@ class ShardManager extends Map {
     calculateShardId(guildId) {
         return (0, common_1.calculateShardId)(guildId, this.totalShards);
     }
-    spawn(shardId) {
-        this.debugger?.info(`Spawn shard ${shardId}`);
+    create(shardId) {
+        this.debugger?.info(`Creating shard ${shardId}`);
         let shard = this.get(shardId);
         shard ??= new shard_1.Shard(shardId, {
             token: this.options.token,
@@ -131,7 +73,7 @@ class ShardManager extends Map {
     }
     async spawnShards() {
         const buckets = this.spawnBuckets();
-        this.debugger?.info('Spawn shards');
+        this.debugger?.info('Spawning shards');
         for (const bucket of buckets) {
             for (const shard of bucket) {
                 if (!shard) {
@@ -141,6 +83,81 @@ class ShardManager extends Map {
                 this.connectQueue.push(shard.connect.bind(shard));
             }
         }
+        await this.startResharder();
+    }
+    async startResharder() {
+        if (this.options.resharding.interval <= 0)
+            return;
+        if (this.shardStart !== 0 || this.shardEnd !== this.totalShards)
+            return this.debugger?.debug('Cannot start resharder');
+        this.debugger?.debug('Resharder enabled');
+        setInterval(async () => {
+            this.debugger?.debug('Checking if reshard is needed');
+            const info = await this.options.resharding.getInfo();
+            if (info.shards <= this.totalShards)
+                return this.debugger?.debug('Resharding not needed');
+            //https://github.com/discordeno/discordeno/blob/6a5f446c0651b9fad9f1550ff1857fe7a026426b/packages/gateway/src/manager.ts#L106C8-L106C94
+            const percentage = (info.shards / ((this.totalShards * 2500) / 1000)) * 100;
+            if (percentage < this.options.resharding.percentage)
+                return this.debugger?.debug(`Percentage is not enough to reshard ${percentage}/${this.options.resharding.percentage}`);
+            this.debugger?.info('Starting resharding process');
+            this.connectQueue.concurrency = info.session_start_limit.max_concurrency;
+            this.options.info.session_start_limit.max_concurrency = info.session_start_limit.max_concurrency;
+            //waiting for all shards to connect
+            let shardsConnected = 0;
+            const handleGuilds = new Set();
+            let handlePayload = async (sharder, _, packet) => {
+                if (packet.t === 'GUILD_CREATE' || packet.t === 'GUILD_DELETE') {
+                    handleGuilds.delete(packet.d.id);
+                    if (shardsConnected === info.shards && !handleGuilds.size) {
+                        return cleanProcess(sharder);
+                    }
+                }
+                if (packet.t !== 'READY')
+                    return;
+                for (const guild of packet.d.guilds) {
+                    handleGuilds.add(guild.id);
+                }
+                if (++shardsConnected < info.shards || handleGuilds.size)
+                    return;
+                cleanProcess(sharder);
+                // dont listen more events when all shards are ready
+            };
+            const cleanProcess = (sharder) => {
+                handlePayload = async () => {
+                    //
+                };
+                this.disconnectAll();
+                this.clear();
+                this.options.totalShards = this.options.shardEnd = info.shards;
+                for (const [id, shard] of sharder) {
+                    shard.options.handlePayload = (shardId, packet) => {
+                        return this.options.handlePayload(shardId, packet);
+                    };
+                    this.set(id, shard);
+                }
+                sharder.clear();
+            };
+            const options = (0, common_1.MergeOptions)(this.options, {
+                totalShards: info.shards,
+                shardEnd: info.shards,
+            });
+            const resharder = new ShardManager({
+                ...options,
+                resharding: {
+                    // getInfo mock, we don't need it
+                    getInfo: () => ({}),
+                    interval: 0,
+                    percentage: 0,
+                },
+                handlePayload: (shardId, packet) => {
+                    return handlePayload(resharder, shardId, packet);
+                },
+            });
+            // share ratelimit
+            resharder.connectQueue = this.connectQueue;
+            await resharder.spawnShards();
+        }, this.options.resharding.interval);
     }
     /*
      * spawns buckets in order
@@ -152,7 +169,7 @@ class ShardManager extends Map {
         chunks.forEach((arr, index) => {
             for (let i = 0; i < arr.length; i++) {
                 const id = i + (index > 0 ? index * this.concurrency : 0) + this.shardStart;
-                chunks[index][i] = this.spawn(id);
+                chunks[index][i] = this.create(id);
             }
         });
         this.debugger?.info(`${chunks.length} buckets created`);
@@ -160,7 +177,7 @@ class ShardManager extends Map {
     }
     forceIdentify(shardId) {
         this.debugger?.info(`Shard #${shardId} force identify`);
-        return this.spawn(shardId).identify();
+        return this.create(shardId).identify();
     }
     disconnect(shardId) {
         this.debugger?.info(`Shard #${shardId} force disconnect`);
@@ -168,10 +185,7 @@ class ShardManager extends Map {
     }
     disconnectAll() {
         this.debugger?.info('Disconnect all shards');
-        return new Promise(resolve => {
-            this.forEach(shard => shard.disconnect());
-            resolve(null);
-        });
+        this.forEach(shard => shard.disconnect());
     }
     setShardPresence(shardId, payload) {
         this.debugger?.info(`Shard #${shardId} update presence`);
@@ -181,12 +195,9 @@ class ShardManager extends Map {
         });
     }
     setPresence(payload) {
-        return new Promise(resolve => {
-            this.forEach(shard => {
-                this.setShardPresence(shard.id, payload);
-            }, this);
-            resolve();
-        });
+        this.forEach(shard => {
+            this.setShardPresence(shard.id, payload);
+        }, this);
     }
     joinVoice(guild_id, channel_id, options) {
         const shardId = this.calculateShardId(guild_id);
@@ -202,7 +213,6 @@ class ShardManager extends Map {
     }
     leaveVoice(guild_id) {
         const shardId = this.calculateShardId(guild_id);
-        this.debugger?.info(`Shard #${shardId} leave voice in ${guild_id}`);
         return this.send(shardId, {
             op: types_1.GatewayOpcodes.VoiceStateUpdate,
             d: {
@@ -223,5 +233,12 @@ class ShardManager extends Map {
         }
         this.get(shardId)?.send(false, payload);
     }
+    resume(shardId, shardData) {
+        if (this.has(shardId))
+            throw new Error('Cannot override existing shard');
+        const shard = this.create(shardId);
+        shard.data = shardData;
+        return this.connectQueue.push(shard.connect.bind(shard));
+    }
 }
 exports.ShardManager = ShardManager;

package/lib/websocket/discord/shared.d.ts

@@ -1,5 +1,5 @@
-import type { APIGatewayBotInfo, GatewayDispatchPayload, GatewayIntentBits, GatewayPresenceUpdateData } from '../../types';
 import type { Awaitable, DeepPartial, Logger } from '../../common';
+import type { APIGatewayBotInfo, GatewayDispatchPayload, GatewayIntentBits, GatewayPresenceUpdateData } from '../../types';
 import type { IdentifyProperties } from '../constants';
 export interface ShardManagerOptions extends ShardDetails {
     /** Important data which is used by the manager to connect shards to the gateway. */
@@ -36,18 +36,6 @@ export interface ShardManagerOptions extends ShardDetails {
         getInfo(): Promise<APIGatewayBotInfo>;
         interval: number;
         percentage: number;
-        /**
-         *
-         * @param ids
-         * @returns
-         */
-        reloadGuilds: (ids: string[]) => unknown;
-        /**
-         *
-         * @param id
-         * @returns true if deleted
-         */
-        onGuild: (id: string) => boolean;
     };
 }
 export interface CustomManagerAdapter {
@@ -64,7 +52,7 @@ export interface WorkerManagerOptions extends Omit<ShardManagerOptions, 'handleP
     shardsPerWorker?: number;
     workerProxy?: boolean;
     path: string;
-    handlePayload(shardId: number, workerId: number, packet: GatewayDispatchPayload): unknown;
+    handlePayload?(shardId: number, workerId: number, packet: GatewayDispatchPayload): any;
     properties?: DeepPartial<NonNullable<ShardManagerOptions['properties']>>;
 }
 export interface ShardData {
@@ -129,4 +117,5 @@ export interface WorkerData {
     debug: boolean;
     workerProxy: boolean;
     __USING_WATCHER__?: boolean;
+    resharding: boolean;
 }

package/lib/websocket/discord/socket/custom.js

@@ -186,12 +186,24 @@ class SeyfertWebSocket {
         frame.set(buffer, frame.length - length);
         this.socket?.write(frame);
     }
-    onping(_data) { }
-    onpong(_data) { }
-    onopen() { }
-    onmessage(_payload) { }
-    onclose(_close) { }
-    onerror(_err) { }
+    onping(_data) {
+        //
+    }
+    onpong(_data) {
+        //
+    }
+    onopen() {
+        //
+    }
+    onmessage(_payload) {
+        //
+    }
+    onclose(_close) {
+        //
+    }
+    onerror(_err) {
+        //
+    }
     close(code, reason) {
         this.__closeCalled = true;
         // alloc payload length
@@ -203,6 +215,7 @@ class SeyfertWebSocket {
         // message, close opcode
         this._write(buffer, 0x8);
         this.socket?.end();
+        this.onclose({ code, reason });
     }
     pong(data) {
         //send pong opcode (10)

package/lib/websocket/discord/worker.d.ts

@@ -9,13 +9,16 @@ export interface WorkerShardInfo {
 export type WorkerInfo = {
     shards: WorkerShardInfo[];
 };
-type CreateWorkerMessage<T extends string, D extends object = {}> = {
+type CreateWorkerMessage<T extends string, D extends object = object> = {
     type: T;
     workerId: number;
 } & D;
 export type WorkerRequestConnect = CreateWorkerMessage<'CONNECT_QUEUE', {
     shardId: number;
 }>;
+export type WorkerRequestConnectResharding = CreateWorkerMessage<'CONNECT_QUEUE_RESHARDING', {
+    shardId: number;
+}>;
 export type WorkerReceivePayload = CreateWorkerMessage<'RECEIVE_PAYLOAD', {
     shardId: number;
     payload: GatewayDispatchPayload;
@@ -35,8 +38,11 @@ export type WorkerSendInfo = CreateWorkerMessage<'WORKER_INFO', WorkerInfo & {
     nonce: string;
 }>;
 export type WorkerReady = CreateWorkerMessage<'WORKER_READY'>;
+export type WorkerReadyResharding = CreateWorkerMessage<'WORKER_READY_RESHARDING'>;
 export type WorkerShardsConnected = CreateWorkerMessage<'WORKER_SHARDS_CONNECTED'>;
 export type WorkerStart = CreateWorkerMessage<'WORKER_START'>;
+export type WorkerStartResharding = CreateWorkerMessage<'WORKER_START_RESHARDING'>;
+export type WorkerDisconnectedAllShardsResharding = CreateWorkerMessage<'DISCONNECTED_ALL_SHARDS_RESHARDING'>;
 export type WorkerSendApiRequest = CreateWorkerMessage<'WORKER_API_REQUEST', {
     method: HttpMethods;
     url: `/${string}`;
@@ -52,5 +58,5 @@ export type WorkerSendEval = CreateWorkerMessage<'EVAL', {
     nonce: string;
     toWorkerId: number;
 }>;
-export type WorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendEval | WorkerStart;
+export type WorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendEval | WorkerStart | WorkerStartResharding | WorkerRequestConnectResharding | WorkerReadyResharding | WorkerDisconnectedAllShardsResharding;
 export {};