seyfert 4.5.0 → 5.0.0

package/lib/structures/channels.js

@@ -8,10 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectoryChannel = exports.NewsChannel = exports.CategoryChannel = exports.ThreadChannel = exports.ForumChannel = exports.MediaChannel = exports.StageChannel = exports.VoiceChannel = exports.DMChannel = exports.TextGuildChannel = exports.WebhookChannelMethods = exports.WebhookGuildMethods = exports.VoiceChannelMethods = exports.ThreadOnlyMethods = exports.TopicableGuildChannel = exports.TextBaseGuildChannel = exports.MessagesMethods = exports.BaseGuildChannel = exports.BaseChannel = exports.BaseNoEditableChannel = void 0;
 exports.channelFrom = channelFrom;
-const __1 = require("..");
 const builders_1 = require("../builders");
-const client_1 = require("../client");
-const common_1 = require("../common");
+const transformers_1 = require("../client/transformers");
+const formatter_1 = require("../common/it/formatter");
+const utils_1 = require("../common/it/utils");
 const mixer_1 = require("../deps/mixer");
 const types_1 = require("../types");
 const DiscordBase_1 = require("./extra/DiscordBase");
@@ -24,7 +24,7 @@ class BaseNoEditableChannel extends DiscordBase_1.DiscordBase {
     }
     /** The URL to the channel */
     get url() {
-        return __1.Formatter.channelLink(this.id);
+        return formatter_1.Formatter.channelLink(this.id);
     }
     fetch(mode = 'flow') {
         switch (mode) {
@@ -39,7 +39,7 @@ class BaseNoEditableChannel extends DiscordBase_1.DiscordBase {
         return this.client.channels.delete(this.id, { reason });
     }
     toString() {
-        return __1.Formatter.channelMention(this.id);
+        return formatter_1.Formatter.channelMention(this.id);
     }
     isStage() {
         return this.type === types_1.ChannelType.GuildStageVoice;
@@ -77,6 +77,12 @@ class BaseNoEditableChannel extends DiscordBase_1.DiscordBase {
     isGuildTextable() {
         return !this.isDM() && this.isTextable();
     }
+    isNamed() {
+        return typeof this.name === 'string';
+    }
+    isGuild() {
+        return !this.isDM();
+    }
     isThreadOnly() {
         return this.isForum() || this.isMedia();
     }
@@ -148,7 +154,7 @@ class BaseGuildChannel extends BaseChannel {
         }
     }
     get url() {
-        return __1.Formatter.channelLink(this.id, this.guildId);
+        return formatter_1.Formatter.channelLink(this.id, this.guildId);
     }
     setPosition(position, reason) {
         return this.edit({ position }, reason);
@@ -211,7 +217,7 @@ class MessagesMethods extends DiscordBase_1.DiscordBase {
         const payload = {
             allowed_mentions: self.options?.allowedMentions,
             ...body,
-            embeds: body.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)),
+            embeds: body.embeds?.map(x => ('toJSON' in x ? x.toJSON() : x)),
             components: body.components?.map(x => ('toJSON' in x ? x.toJSON() : x)) ?? undefined,
             poll: poll ? (poll instanceof builders_1.PollBuilder ? poll.toJSON() : poll) : undefined,
         };
@@ -251,32 +257,32 @@ exports.TextBaseGuildChannel = TextBaseGuildChannel = __decorate([
 function channelFrom(data, client) {
     switch (data.type) {
         case types_1.ChannelType.GuildStageVoice:
-            return client_1.Transformers.StageChannel(client, data);
+            return transformers_1.Transformers.StageChannel(client, data);
         case types_1.ChannelType.GuildMedia:
-            return client_1.Transformers.MediaChannel(client, data);
+            return transformers_1.Transformers.MediaChannel(client, data);
         case types_1.ChannelType.DM:
-            return client_1.Transformers.DMChannel(client, data);
+            return transformers_1.Transformers.DMChannel(client, data);
         case types_1.ChannelType.GuildForum:
-            return client_1.Transformers.ForumChannel(client, data);
+            return transformers_1.Transformers.ForumChannel(client, data);
         case types_1.ChannelType.AnnouncementThread:
         case types_1.ChannelType.PrivateThread:
         case types_1.ChannelType.PublicThread:
-            return client_1.Transformers.ThreadChannel(client, data);
+            return transformers_1.Transformers.ThreadChannel(client, data);
         case types_1.ChannelType.GuildDirectory:
-            return client_1.Transformers.DirectoryChannel(client, data);
+            return transformers_1.Transformers.DirectoryChannel(client, data);
         case types_1.ChannelType.GuildVoice:
-            return client_1.Transformers.VoiceChannel(client, data);
+            return transformers_1.Transformers.VoiceChannel(client, data);
         case types_1.ChannelType.GuildText:
-            return client_1.Transformers.TextGuildChannel(client, data);
+            return transformers_1.Transformers.TextGuildChannel(client, data);
         case types_1.ChannelType.GuildCategory:
-            return client_1.Transformers.CategoryChannel(client, data);
+            return transformers_1.Transformers.CategoryChannel(client, data);
         case types_1.ChannelType.GuildAnnouncement:
-            return client_1.Transformers.NewsChannel(client, data);
+            return transformers_1.Transformers.NewsChannel(client, data);
         default: {
             if ('guild_id' in data) {
-                return client_1.Transformers.BaseGuildChannel(client, data);
+                return transformers_1.Transformers.BaseGuildChannel(client, data);
             }
-            return client_1.Transformers.BaseChannel(client, data);
+            return transformers_1.Transformers.BaseChannel(client, data);
         }
     }
 }
@@ -335,19 +341,14 @@ class VoiceChannelMethods extends DiscordBase_1.DiscordBase {
     states() {
         if (!this.guildId)
             return this.cache.adapter.isAsync ? Promise.resolve([]) : [];
-        return (0, common_1.fakePromise)(this.cache.voiceStates?.values(this.guildId) ??
+        return (0, utils_1.fakePromise)(this.cache.voiceStates?.values(this.guildId) ??
             (this.cache.adapter.isAsync ? Promise.resolve([]) : [])).then(states => {
             return states.filter(state => state.channelId === this.id);
         });
     }
     async members(force) {
-        const collection = new __1.Collection();
         const states = await this.states();
-        for (const state of states) {
-            const member = await state.member(force);
-            collection.set(member.id, member);
-        }
-        return collection;
+        return await Promise.all(states.map(state => state.member(force)));
     }
 }
 exports.VoiceChannelMethods = VoiceChannelMethods;

package/lib/structures/extra/BitField.d.ts

@@ -1,4 +1,4 @@
-export type BitFieldResolvable<T extends object> = keyof T | bigint;
+export type BitFieldResolvable<T extends object> = keyof T | number | bigint | string;
 export declare class BitField<T extends object> {
     static None: bigint;
     Flags: Record<string, bigint>;
@@ -6,12 +6,12 @@ export declare class BitField<T extends object> {
     constructor(bitfields?: BitFieldResolvable<T>);
     set bits(bits: BitFieldResolvable<T>);
     get bits(): bigint;
-    has(bits: BitFieldResolvable<T>[]): boolean;
+    has(bits: BitFieldResolvable<T> | BitFieldResolvable<T>[]): boolean;
     missings(bits: BitFieldResolvable<T>[]): bigint[];
     equals(other: BitFieldResolvable<T>[]): boolean;
-    keys(bits?: BitFieldResolvable<T>[]): string[];
+    keys(bits?: BitFieldResolvable<T>[]): (keyof T)[];
     values(bits?: BitFieldResolvable<T>[]): bigint[];
     add(bits: BitFieldResolvable<T>[]): bigint;
     remove(bits: BitFieldResolvable<T>[]): bigint;
-    resolve(bits: BitFieldResolvable<T> | BitFieldResolvable<T>[]): bigint;
+    resolve(bits: BitFieldResolvable<T> | BitFieldResolvable<T>[], _flags?: Record<string, bigint>): bigint;
 }

package/lib/structures/extra/BitField.js

@@ -16,7 +16,8 @@ class BitField {
         return this.bit;
     }
     has(bits) {
-        const bitsResolved = bits.map(bit => this.resolve(bit));
+        const data = Array.isArray(bits) ? bits : [bits];
+        const bitsResolved = data.map(bit => this.resolve(bit));
         return bitsResolved.every(bit => (this.bits & bit) === bit);
     }
     missings(bits) {
@@ -60,21 +61,36 @@ class BitField {
         }
         return this.bits;
     }
-    resolve(bits) {
+    resolve(bits, _flags) {
+        const flags = _flags ?? this.Flags;
         let bitsResult = 0n;
         for (const bit of Array.isArray(bits) ? bits : [bits]) {
             switch (typeof bit) {
                 case 'string':
-                    bitsResult |= this.resolve([this.Flags[bit]]);
+                    if (Object.hasOwn(flags, bit)) {
+                        bitsResult |= flags[bit];
+                    }
+                    else if (/^\d+$/.test(bit)) {
+                        bitsResult |= BigInt(bit);
+                    }
+                    else {
+                        throw new TypeError(`Cannot resolve bitfield: ${bit}`);
+                    }
                     break;
                 case 'number':
+                    if (!Number.isSafeInteger(bit) || bit < 0) {
+                        throw new TypeError(`Cannot resolve bitfield: ${bit}`);
+                    }
                     bitsResult |= BigInt(bit);
                     break;
                 case 'bigint':
+                    if (bit < 0n) {
+                        throw new TypeError(`Cannot resolve bitfield: ${bit}`);
+                    }
                     bitsResult |= bit;
                     break;
                 default:
-                    throw new TypeError(`Cannot resolve permission: ${typeof bit === 'symbol' ? String(bit) : bit}`);
+                    throw new TypeError(`Cannot resolve bitfield: ${typeof bit === 'symbol' ? String(bit) : bit}`);
             }
         }
         return bitsResult;

package/lib/structures/extra/DiscordBase.js

@@ -16,7 +16,7 @@ class DiscordBase extends Base_1.Base {
      * Create a timestamp for the current object.
      */
     get createdTimestamp() {
-        return Number((0, utils_1.snowflakeToTimestamp)(this.id));
+        return (0, utils_1.snowflakeToTimestamp)(this.id);
     }
     /**
      * createdAt gets the creation Date instace of the current object.

package/lib/structures/extra/Permissions.d.ts

@@ -57,10 +57,8 @@ export declare class PermissionsBitField extends BitField<typeof PermissionFlags
     };
     static All: bigint;
     constructor(bitfields?: BitFieldResolvable<typeof PermissionFlagsBits> | BitFieldResolvable<typeof PermissionFlagsBits>[]);
-    keys: (bits?: BitFieldResolvable<typeof PermissionFlagsBits>[]) => (keyof typeof PermissionFlagsBits)[];
-    has(bits: BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
-    strictHas(bits: BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
-    resolve<T extends typeof PermissionFlagsBits>(bits: BitFieldResolvable<T> | BitFieldResolvable<T>[]): bigint;
+    has(bits: BitFieldResolvable<typeof PermissionFlagsBits> | BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
+    strictHas(bits: BitFieldResolvable<typeof PermissionFlagsBits> | BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
     static resolve<T extends typeof PermissionFlagsBits>(bits: BitFieldResolvable<T> | BitFieldResolvable<T>[]): bigint;
     toString(): string;
 }

package/lib/structures/extra/Permissions.js

@@ -17,24 +17,8 @@ class PermissionsBitField extends BitField_1.BitField {
     strictHas(bits) {
         return super.has(bits);
     }
-    resolve(bits) {
-        return (Array.isArray(bits) ? bits : [bits]).reduce((acc, cur) => acc | PermissionsBitField.resolve([cur]), BitField_1.BitField.None);
-    }
     static resolve(bits) {
-        let bitsResult = 0n;
-        for (const bit of Array.isArray(bits) ? bits : [bits]) {
-            switch (typeof bit) {
-                case 'string':
-                    bitsResult |= PermissionsBitField.resolve(types_1.PermissionFlagsBits[bit]);
-                    break;
-                case 'bigint':
-                    bitsResult |= bit;
-                    break;
-                default:
-                    throw new TypeError(`Cannot resolve permission: ${typeof bit === 'symbol' ? String(bit) : bit}`);
-            }
-        }
-        return bitsResult;
+        return BitField_1.BitField.prototype.resolve(bits, types_1.PermissionFlagsBits);
     }
     toString() {
         return this.bit.toString();

package/lib/types/payloads/_interactions/responses.d.ts

@@ -86,8 +86,8 @@ export declare enum InteractionResponseType {
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-interaction-callback-data-structure
  */
 export type APIInteractionResponseCallbackData = Omit<RESTPostAPIWebhookWithTokenJSONBody, 'avatar_url' | 'username'>;
-export interface APICommandAutocompleteInteractionResponseCallbackData {
-    choices?: APIApplicationCommandOptionChoice[];
+export interface APICommandAutocompleteInteractionResponseCallbackData<ValueType extends number | string = number | string> {
+    choices?: APIApplicationCommandOptionChoice<ValueType>[];
 }
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-modal

package/lib/types/payloads/components.d.ts

@@ -222,11 +222,11 @@ export interface APIBaseAutoPopulatedSelectMenuComponent<T extends ComponentType
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menus
  */
-export interface APIStringSelectComponent extends APIBaseSelectMenuComponent<ComponentType.StringSelect> {
+export interface APIStringSelectComponent<Value extends string = string> extends APIBaseSelectMenuComponent<ComponentType.StringSelect> {
     /**
      * Specified choices in a select menu; max 25
      */
-    options: APISelectMenuOption[];
+    options: APISelectMenuOption<Value>[];
     /**
      * Whether the string select is required to answer in a modal
      *
@@ -278,7 +278,7 @@ export type APISelectMenuComponent = APIChannelSelectComponent | APIMentionableS
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menu-object-select-option-structure
  */
-export interface APISelectMenuOption {
+export interface APISelectMenuOption<Value extends string = string> {
     /**
      * The user-facing name of the option (max 100 chars)
      */
@@ -286,7 +286,7 @@ export interface APISelectMenuOption {
     /**
      * The dev-defined value of the option (max 100 chars)
      */
-    value: string;
+    value: Value;
     /**
      * An additional description of the option (max 100 chars)
      */

package/lib/websocket/SharedTypes.d.ts

@@ -1,5 +1,5 @@
 import type { RestToKeys } from '../common';
-import type { APIAuditLogEntry, APIAutoModerationRule, APIChannel, APIEntitlement, APIGuild, APIGuildMember, APIGuildScheduledEvent, APIStageInstance, APISubscription, APIUser, GatewayActivity, GatewayAutoModerationActionExecutionDispatchData, GatewayChannelPinsUpdateDispatchData, GatewayChannelUpdateDispatchData, GatewayDispatchEvents, GatewayEntitlementCreateDispatchData, GatewayGuildBanAddDispatchData, GatewayGuildBanRemoveDispatchData, GatewayGuildCreateDispatchData, GatewayGuildDeleteDispatchData, GatewayGuildEmojisUpdateDispatchData, GatewayGuildIntegrationsUpdateDispatchData, GatewayGuildMemberAddDispatchData, GatewayGuildMemberRemoveDispatchData, GatewayGuildMembersChunkDispatchData, GatewayGuildMemberUpdateDispatchData, 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, GatewayThreadMembersUpdateDispatchData, GatewayThreadMemberUpdateDispatchData, GatewayTypingStartDispatchData, GatewayUserUpdateDispatchData, GatewayVoiceChannelEffectSendDispachData, GatewayVoiceServerUpdateDispatchData, GatewayVoiceStateUpdateData, GatewayWebhooksUpdateDispatchData, PresenceUpdateStatus } from '../types';
+import type { APIAuditLogEntry, APIAutoModerationRule, APIChannel, APIEntitlement, APIGuild, APIGuildMember, APIGuildScheduledEvent, APIStageInstance, APISubscription, APIUser, GatewayActivity, GatewayAutoModerationActionExecutionDispatchData, GatewayChannelPinsUpdateDispatchData, GatewayChannelUpdateDispatchData, GatewayDispatchEvents, GatewayEntitlementCreateDispatchData, GatewayGuildBanAddDispatchData, GatewayGuildBanRemoveDispatchData, GatewayGuildCreateDispatchData, GatewayGuildDeleteDispatchData, GatewayGuildEmojisUpdateDispatchData, GatewayGuildIntegrationsUpdateDispatchData, GatewayGuildMemberAddDispatchData, GatewayGuildMemberRemoveDispatchData, GatewayGuildMembersChunkDispatchData, GatewayGuildMemberUpdateDispatchData, 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, GatewayThreadMembersUpdateDispatchData, GatewayThreadMemberUpdateDispatchData, GatewayThreadUpdateDispatchData, GatewayTypingStartDispatchData, GatewayUserUpdateDispatchData, GatewayVoiceChannelEffectSendDispachData, GatewayVoiceServerUpdateDispatchData, GatewayVoiceStateUpdateData, GatewayWebhooksUpdateDispatchData, PresenceUpdateStatus } from '../types';
 import type { APISoundboardSound } from '../types/payloads/soundboard';
 /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
 export interface StatusUpdate {
@@ -41,7 +41,7 @@ export interface Events {
     [GatewayDispatchEvents.AutoModerationActionExecution]: GatewayAutoModerationActionExecutionDispatchData;
     [GatewayDispatchEvents.ThreadCreate]: GatewayThreadCreateDispatchData;
     [GatewayDispatchEvents.ThreadDelete]: GatewayThreadDeleteDispatchData;
-    [GatewayDispatchEvents.ThreadUpdate]: GatewayThreadDeleteDispatchData;
+    [GatewayDispatchEvents.ThreadUpdate]: GatewayThreadUpdateDispatchData;
     [GatewayDispatchEvents.ThreadListSync]: GatewayThreadListSyncDispatchData;
     [GatewayDispatchEvents.ThreadMemberUpdate]: GatewayThreadMemberUpdateDispatchData;
     [GatewayDispatchEvents.ThreadMembersUpdate]: GatewayThreadMembersUpdateDispatchData;
@@ -119,7 +119,7 @@ export type ChannelSameEvents = RestToKeys<[
     GatewayDispatchEvents.ChannelDelete,
     GatewayDispatchEvents.ChannelUpdate
 ]>;
-export type AutoModetaractionRuleEvents = RestToKeys<[
+export type AutoModerationRuleEvents = RestToKeys<[
     APIAutoModerationRule,
     GatewayDispatchEvents.AutoModerationRuleCreate,
     GatewayDispatchEvents.AutoModerationRuleDelete,
@@ -141,7 +141,7 @@ export type SoundboardSoundsEvents = RestToKeys<[
     GatewayDispatchEvents.GuildSoundboardSoundCreate,
     GatewayDispatchEvents.GuildSoundboardSoundUpdate
 ]>;
-export type NormalizeEvents = Events & AutoModetaractionRuleEvents & ChannelSameEvents & GuildScheduledSameEvents & GuildScheduledUserSameEvents & IntegrationSameEvents & EntitlementEvents & PollVoteSameEvents & StageSameEvents & SubscriptionEvents & SoundboardSoundsEvents & {
+export type NormalizeEvents = Events & AutoModerationRuleEvents & ChannelSameEvents & GuildScheduledSameEvents & GuildScheduledUserSameEvents & IntegrationSameEvents & EntitlementEvents & PollVoteSameEvents & StageSameEvents & SubscriptionEvents & SoundboardSoundsEvents & {
     RAW: GatewayDispatchEvents;
 };
 export type GatewayEvents = {

package/lib/websocket/constants/index.d.ts

@@ -23,4 +23,4 @@ export interface IdentifyProperties {
      */
     device: string;
 }
-export { COMPRESS, ShardManagerDefaults, WorkerManagerDefaults, properties };
+export { COMPRESS, properties, ShardManagerDefaults, WorkerManagerDefaults };

package/lib/websocket/constants/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.properties = exports.WorkerManagerDefaults = exports.ShardManagerDefaults = exports.COMPRESS = void 0;
+exports.WorkerManagerDefaults = exports.ShardManagerDefaults = exports.properties = exports.COMPRESS = void 0;
 const COMPRESS = false;
 exports.COMPRESS = COMPRESS;
-const propertiesVersion = 'Seyfert v4.5.0 (https://seyfert.dev)';
+const propertiesVersion = 'Seyfert v5.0.0 (https://seyfert.dev)';
 const properties = {
     os: process.platform,
     browser: propertiesVersion,
@@ -26,6 +26,7 @@ const ShardManagerDefaults = {
 exports.ShardManagerDefaults = ShardManagerDefaults;
 const WorkerManagerDefaults = {
     ...ShardManagerDefaults,
+    mode: 'threads',
     shardsPerWorker: 16,
 };
 exports.WorkerManagerDefaults = WorkerManagerDefaults;

package/lib/websocket/discord/events/memberUpdate.js

@@ -9,8 +9,8 @@ class MemberUpdateHandler {
             return true;
         }
         const data = this.guildMemberUpdate.get(member.user.id);
-        if (this.usersEqual(data.member.user, member.user)) {
-            return this.membersEquals(data.member, member);
+        if (this.usersEqual(data.member.user, member.user) && this.membersEquals(data.member, member)) {
+            return false;
         }
         clearTimeout(data.timeout);
         this.setMember(member);

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

@@ -14,4 +14,5 @@ export declare class Heartbeater {
     constructor(sendMethod: (workerId: number, data: WorkerHeartbeaterMessages) => Awaitable<void>, interval: number);
     register(workerId: number, recreate: (workerId: number) => Awaitable<void>): void;
     acknowledge(workerId: number): void;
+    unregister(workerId: number): void;
 }

package/lib/websocket/discord/heartbeater.js

@@ -31,5 +31,12 @@ class Heartbeater {
             return;
         heartbeat.ack = true;
     }
+    unregister(workerId) {
+        const heartbeat = this.store.get(workerId);
+        if (!heartbeat)
+            return;
+        clearInterval(heartbeat.interval);
+        this.store.delete(workerId);
+    }
 }
 exports.Heartbeater = Heartbeater;

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

@@ -1,4 +1,4 @@
-import { Logger, type MakeRequired } from '../../common';
+import { Logger, type MakePresent } from '../../common';
 import { type APIGuildMember, type GatewayGuildMembersChunkPresence, type GatewayReceivePayload, type GatewaySendPayload } from '../../types';
 import type { GatewayRequestGuildMembersDataWithQuery, GatewayRequestGuildMembersDataWithUserIds } from '../../types/gateway';
 import { DynamicBucket } from '../structures';
@@ -27,7 +27,7 @@ export declare class Shard {
     bucket: DynamicBucket;
     offlineSendQueue: ((_?: unknown) => void)[];
     pendingGuilds?: Set<string>;
-    options: MakeRequired<ShardOptions, 'properties' | 'ratelimitOptions' | 'reconnectTimeout' | 'connectionTimeout'>;
+    options: MakePresent<ShardOptions, 'properties' | 'ratelimitOptions' | 'reconnectTimeout' | 'connectionTimeout'>;
     isReady: boolean;
     connectionTimeout?: NodeJS.Timeout;
     private requestGuildMembersChunk;

package/lib/websocket/discord/shard.js

@@ -96,7 +96,7 @@ class Shard {
             this.handleMessage(data);
         };
         this.websocket.onclose = (event) => this.handleClosed(event);
-        this.websocket.onerror = (event) => this.logger.error(event);
+        this.websocket.onerror = (event) => this.logger.error(`Shard #${this.id}`, event);
         this.websocket.onopen = () => {
             this.isConnecting = false;
             this.heart.ack = true;
@@ -104,14 +104,16 @@ class Shard {
         };
     }
     async send(force, message) {
-        this.debugger?.info(`[Shard #${this.id}] Sending: ${types_1.GatewayOpcodes[message.op]} ${JSON.stringify(message.d, (_, value) => {
-            if (typeof value === 'string')
-                return value.replaceAll(this.options.token, v => {
-                    const split = v.split('.');
-                    return `${split[0]}.${'*'.repeat(split[1].length)}.${'*'.repeat(split[2].length)}`;
-                });
-            return value;
-        }, 1)}`);
+        if (this.debugger) {
+            this.debugger.info(`[Shard #${this.id}] Sending: ${types_1.GatewayOpcodes[message.op]} ${JSON.stringify(message.d, (_, value) => {
+                if (typeof value === 'string')
+                    return value.replaceAll(this.options.token, v => {
+                        const split = v.split('.');
+                        return `${split[0]}.${'*'.repeat(split[1].length)}.${'*'.repeat(split[2].length)}`;
+                    });
+                return value;
+            }, 1)}`);
+        }
         await this.checkOffline(force);
         await this.bucket.acquire(force);
         await this.checkOffline(force);
@@ -220,7 +222,7 @@ class Shard {
             case types_1.GatewayOpcodes.InvalidSession: {
                 if (packet.d) {
                     if (!this.resumable) {
-                        return this.logger.fatal('This is a completely unexpected error message.');
+                        return this.logger.fatal(`Shard #${this.id} received a non-resumable InvalidSession, cannot resume.`);
                     }
                     return this.resume();
                 }
@@ -383,7 +385,7 @@ class Shard {
         this.isReady = false;
         clearInterval(this.heart.nodeInterval);
         clearTimeout(this.heart.ackTimeout);
-        this.logger.warn(`${shared_1.ShardSocketCloseCodes[close.code] ?? types_1.GatewayCloseCodes[close.code] ?? close.code} (${close.code})`, close.reason);
+        this.logger.warn(`Shard #${this.id} closed: ${shared_1.ShardSocketCloseCodes[close.code] ?? types_1.GatewayCloseCodes[close.code] ?? close.code} (${close.code})`, close.reason);
         try {
             switch (close.code) {
                 case shared_1.ShardSocketCloseCodes.Shutdown:
@@ -424,11 +426,11 @@ class Shard {
                 case types_1.GatewayCloseCodes.InvalidIntents:
                 case types_1.GatewayCloseCodes.InvalidShard:
                 case types_1.GatewayCloseCodes.ShardingRequired:
-                    this.logger.fatal('Cannot reconnect');
+                    this.logger.fatal(`Shard #${this.id} cannot reconnect`);
                     break;
                 default:
                     {
-                        this.logger.warn('Unknown close code, trying to reconnect anyways');
+                        this.logger.warn(`Shard #${this.id} unknown close code (${close.code}), trying to reconnect anyways`);
                         await this.reconnect();
                     }
                     break;

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

@@ -1,4 +1,4 @@
-import { Logger, type MakeRequired } from '../../common';
+import { Logger, type MakePresent, type MakeRequired } from '../../common';
 import type { MakeDeepPartial } from '../../common/types/util';
 import { type GatewaySendPayload, type GatewayUpdatePresence, type GatewayVoiceStateUpdate } from '../../types';
 import { ShardManagerDefaults } from '../constants';
@@ -7,7 +7,7 @@ import { Shard } from './shard';
 import { type ShardData, type ShardManagerOptions, ShardSocketCloseCodes } from './shared';
 export declare class ShardManager extends Map<number, Shard> {
     connectQueue: ConnectQueue;
-    options: MakeRequired<ShardManagerOptions, keyof typeof ShardManagerDefaults>;
+    options: MakePresent<ShardManagerOptions, keyof typeof ShardManagerDefaults>;
     debugger?: Logger;
     constructor(options: MakeDeepPartial<ShardManagerOptions, 'resharding'>);
     get totalShards(): number;
@@ -24,11 +24,12 @@ export declare class ShardManager extends Map<number, Shard> {
     forceIdentify(shardId: number): Promise<void>;
     disconnect(shardId: number, code?: ShardSocketCloseCodes): void | undefined;
     disconnectAll(code?: ShardSocketCloseCodes): void;
-    setShardPresence(shardId: number, payload: GatewayUpdatePresence['d']): void;
+    setShardPresence(shardId: number, payload: GatewayUpdatePresence['d']): Promise<boolean>;
     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;
-    requestChannelInfo(guild_id: string, fields: ('status' | 'voice_start_time')[]): void;
-    send<T extends GatewaySendPayload>(shardId: number, payload: T): void;
+    joinVoice(guild_id: string, channel_id: string, options: Pick<GatewayVoiceStateUpdate['d'], 'self_deaf' | 'self_mute'>): Promise<boolean>;
+    leaveVoice(guild_id: string): Promise<boolean>;
+    requestChannelInfo(guild_id: string, fields: ('status' | 'voice_start_time')[]): Promise<boolean>;
+    send<T extends GatewaySendPayload>(shardId: number, payload: T): Promise<boolean>;
+    private resolveSendPayload;
     resume(shardId: number, shardData: MakeRequired<ShardData>): unknown;
 }

package/lib/websocket/discord/sharder.js

@@ -69,7 +69,7 @@ class ShardManager extends Map {
             properties: this.options.properties,
             debugger: this.debugger,
             compress: this.options.compress ?? false,
-            presence: this.options.presence?.(shardId, -1),
+            presence: this.options.presence?.(shardId),
             connectionTimeout: this.options.connectionTimeout,
             reconnectTimeout: this.options.reconnectTimeout,
         });
@@ -229,15 +229,35 @@ class ShardManager extends Map {
             },
         });
     }
-    send(shardId, payload) {
+    async send(shardId, payload) {
+        const resolvedPayload = await this.resolveSendPayload(shardId, payload);
+        if (!resolvedPayload)
+            return false;
         if (workerData?.__USING_WATCHER__) {
-            return parentPort?.postMessage({
+            if (!parentPort) {
+                throw new common_1.SeyfertError('INTERNAL_ERROR', {
+                    metadata: { detail: 'Cannot send shard payload without a watcher parent port' },
+                });
+            }
+            parentPort.postMessage({
                 type: 'SEND_TO_SHARD',
                 shardId,
-                payload,
+                payload: resolvedPayload,
             });
+            return true;
+        }
+        const shard = this.get(shardId);
+        if (!shard) {
+            throw new common_1.SeyfertError('INTERNAL_ERROR', { metadata: { detail: `Shard #${shardId} doesn't exist` } });
         }
-        this.get(shardId)?.send(false, payload);
+        await shard.send(false, resolvedPayload);
+        return true;
+    }
+    async resolveSendPayload(shardId, payload) {
+        const result = await this.options.handleSendPayload?.(shardId, payload);
+        if (result === null)
+            return null;
+        return (result ?? payload);
     }
     resume(shardId, shardData) {
         if (this.has(shardId))

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

@@ -1,6 +1,6 @@
 import type { InternalRuntimeConfig, InternalRuntimeConfigHTTP } from '../../client/base';
 import type { Awaitable, DeepPartial, Logger } from '../../common';
-import type { APIGatewayBotInfo, GatewayDispatchPayload, GatewayIntentBits, GatewayPresenceUpdateData } from '../../types';
+import type { APIGatewayBotInfo, GatewayDispatchPayload, GatewayIntentBits, GatewayPresenceUpdateData, GatewaySendPayload } from '../../types';
 import type { IdentifyProperties } from '../constants';
 import type { WorkerMessages } from './worker';
 export interface ShardDisconnectData {
@@ -30,6 +30,7 @@ export interface ShardManagerOptions extends ShardDetails {
      * The payload handlers for messages on the shard.
      */
     handlePayload(shardId: number, packet: GatewayDispatchPayload): unknown;
+    handleSendPayload?(shardId: number, payload: GatewaySendPayload): Awaitable<GatewaySendPayload | null | undefined | void>;
     onShardDisconnect?(data: ShardDisconnectData): Awaitable<unknown>;
     onShardReconnect?(data: ShardReconnectData): Awaitable<unknown>;
     /**
@@ -39,7 +40,7 @@ export interface ShardManagerOptions extends ShardDetails {
     /**
      * Set a presence.
      */
-    presence?: (shardId: number, workerId: number) => GatewayPresenceUpdateData;
+    presence?: (shardId: number) => GatewayPresenceUpdateData;
     compress?: boolean;
     resharding?: {
         /**
@@ -56,9 +57,7 @@ export interface CustomManagerAdapter {
     postMessage(workerId: number, body: unknown): Awaitable<unknown>;
     spawn(workerData: WorkerData, env: Record<string, any>): Awaitable<unknown>;
 }
-export interface WorkerManagerOptions extends Omit<ShardManagerOptions, 'handlePayload' | 'properties'> {
-    mode: 'threads' | 'clusters' | 'custom';
-    adapter?: CustomManagerAdapter;
+interface WorkerManagerOptionsBase extends Omit<ShardManagerOptions, 'handlePayload' | 'presence' | 'properties'> {
     workers?: number;
     /**
      * @default 16
@@ -67,12 +66,25 @@ export interface WorkerManagerOptions extends Omit<ShardManagerOptions, 'handleP
     workerProxy?: boolean;
     /** @default 15000 */
     heartbeaterInterval?: number;
-    path: string;
     handlePayload?(shardId: number, workerId: number, packet: GatewayDispatchPayload): any;
+    presence?: (shardId: number, workerId: number) => GatewayPresenceUpdateData;
     handleWorkerMessage?(message: WorkerMessages): any;
     properties?: DeepPartial<NonNullable<ShardManagerOptions['properties']>>;
     getRC?(): Awaitable<InternalRuntimeConfig | InternalRuntimeConfigHTTP>;
 }
+export type WorkerManagerOptions = (WorkerManagerOptionsBase & {
+    mode?: 'threads';
+    path: string;
+    adapter?: CustomManagerAdapter;
+}) | (WorkerManagerOptionsBase & {
+    mode: 'clusters';
+    path: string;
+    adapter?: CustomManagerAdapter;
+}) | (WorkerManagerOptionsBase & {
+    mode: 'custom';
+    adapter: CustomManagerAdapter;
+    path?: string;
+});
 export interface ShardData {
     /** resume seq to resume connections */
     resume_seq: number | null;
@@ -148,3 +160,4 @@ export interface WorkerData {
     __USING_WATCHER__?: boolean;
     resharding: boolean;
 }
+export {};