@seedcord/gateway 0.1.0-next.0 → 0.1.0-next.1

package/dist/index.d.mts

@@ -1,8 +1,9 @@
-import { BuilderComponent, CoreBase, Gate, GateContextBase, GateNoticeOptions, MessageContextMenuRegistry, Notice, OptionKind, PageView, RegisterCommand, RequiredOf, SlashOptionRegistry, UserContextMenuRegistry } from "@seedcord/core";
+import { BuilderComponent, CoreBase, DispatchContext, Gate, GateContextBase, GateNoticeOptions, MessageContextMenuRegistry, Notice, OptionKind, PageView, RegisterCommand, RequiredOf, SlashOptionRegistry, UserContextMenuRegistry } from "@seedcord/core";
 import { AnyCustomId, DecodedParams, GateFitsWith, HasComponentDefs, PageCursor } from "@seedcord/core/internal";
-import { APIInteractionGuildMember, APIMessageComponentEmoji, AnySelectMenuInteraction, ApplicationCommand, ApplicationCommandOptionChoiceData, ApplicationCommandType, ApplicationEmoji, AutocompleteInteraction, BooleanCache, ButtonInteraction, ButtonStyle, CacheType, CacheTypeReducer, ChannelSelectMenuInteraction, ChatInputCommandInteraction, Client, ClientEvents, ClientOptions, Collection, CommandInteractionOption, ContextMenuCommandInteraction, Events, Guild, GuildEmoji, GuildMember, Interaction, MentionableSelectMenuInteraction, Message, MessageContextMenuCommandInteraction, ModalSubmitInteraction, Role, RoleSelectMenuInteraction, Snowflake, StringSelectMenuInteraction, TextChannel, TextChannelResolvable, User, UserContextMenuCommandInteraction, UserSelectMenuInteraction, WebhookClient } from "discord.js";
-import { CoordinatedShutdown, CoordinatedStartup, Logger, SEEventMapLike, SENoEvents, StartupPhase, StrictEventEmitter } from "@seedcord/services";
+import { APIInteractionGuildMember, APIMessageComponentEmoji, AnySelectMenuInteraction, ApplicationCommand, ApplicationCommandOptionChoiceData, ApplicationCommandType, ApplicationEmoji, AutocompleteInteraction, BooleanCache, ButtonInteraction, ButtonStyle, CacheType, CacheTypeReducer, ChannelSelectMenuInteraction, ChannelType, ChatInputCommandInteraction, Client, ClientEvents, ClientOptions, Collection, CommandInteractionOption, ContextMenuCommandInteraction, Events, Guild, GuildEmoji, GuildMember, Interaction, MentionableSelectMenuInteraction, Message, MessageContextMenuCommandInteraction, ModalSubmitInteraction, Role, RoleSelectMenuInteraction, Snowflake, StringSelectMenuInteraction, TextChannel, TextChannelResolvable, User, UserContextMenuCommandInteraction, UserSelectMenuInteraction, WebhookClient } from "discord.js";
+import { CoordinatedShutdown, CoordinatedStartup, Logger, StartupPhase } from "@seedcord/services";
 import { ActionRowBuilder, ButtonBuilder, ContextMenuCommandBuilder, SlashCommandBuilder } from "@discordjs/builders";
+import { EventMap, NoEvents, TypedEventEmitter } from "@seedcord/event-emitter";
 import { HmrAware, HmrUpdateEvent, SeedcordBrand, SeedcordInstance } from "@seedcord/types/internal";
 import { UUID } from "node:crypto";
 import { BotConfig, Config, EmojiMap, IRateLimiter, Nullable, ReplyResponse, Tail, V2Component } from "@seedcord/types";
@@ -10,6 +11,7 @@ export * from "@seedcord/core";
 export * from "@seedcord/errors";
 export * from "@seedcord/utils";
 export * from "@seedcord/services";
+export * from "@seedcord/event-emitter";
 export * from "@seedcord/rate-limiter";
 export type * from "@seedcord/types";
 
@@ -65,7 +67,7 @@ interface Initializeable {
  * Extend this class to create plugins that integrate with the Seedcord lifecycle.
  * Plugins have access to the core instance and must implement initialization logic.
  */
-declare abstract class Plugin<TPluginEvents extends SEEventMapLike<TPluginEvents> = SENoEvents> extends StrictEventEmitter<TPluginEvents> implements Initializeable, HmrAware {
+declare abstract class Plugin<TPluginEvents extends EventMap<TPluginEvents> = NoEvents> extends TypedEventEmitter<TPluginEvents> implements Initializeable, HmrAware {
   protected pluggable: Core;
   /** Logger instance for this plugin. */
   abstract logger: Logger;
@@ -87,11 +89,9 @@ declare abstract class Plugin<TPluginEvents extends SEEventMapLike<TPluginEvents
    */
   protected registerCriticalFiles(patterns: string[]): void;
   /** @internal */
-  setMaxListeners(n: number): this;
-  /** @internal */
   removeListener<TEventKey extends Extract<keyof TPluginEvents, string | symbol>>(event: TEventKey, listener: (...args: TPluginEvents[TEventKey]) => void): this;
   /** @internal */
-  removeAllListeners(eventName?: string | symbol): this;
+  removeAllListeners(event?: Extract<keyof TPluginEvents, string | symbol>): this;
 }
 /**
  * Constructor type for plugins that can accept additional arguments after Core
@@ -113,7 +113,7 @@ type PluginArgs<Ctor extends PluginCtor> = Tail<ConstructorParameters<Ctor>>;
  * Provides plugin attachment capabilities and lifecycle management. Plugins are attached during
  * configuration and initialized during startup. Not constructed directly, the host is a {@link Seedcord}.
  */
-declare class Pluggable<TPluggableEvents extends SEEventMapLike<TPluggableEvents> = SENoEvents> extends StrictEventEmitter<TPluggableEvents> {
+declare class Pluggable<TPluggableEvents extends EventMap<TPluggableEvents> = NoEvents> extends TypedEventEmitter<TPluggableEvents> {
   protected isInitialized: boolean;
   protected readonly shutdown: CoordinatedShutdown;
   protected readonly startup: CoordinatedStartup;
@@ -145,11 +145,9 @@ declare class Pluggable<TPluggableEvents extends SEEventMapLike<TPluggableEvents
    */
   attach<Key extends string, Ctor extends PluginCtor>(this: this, key: Key, Plugin: Ctor, startupPhase: StartupPhase, ...args: PluginArgs<Ctor>): this & Record<Key, InstanceType<Ctor>>;
   /** @internal */
-  setMaxListeners(n: number): this;
-  /** @internal */
   removeListener<TEventKey extends Extract<keyof TPluggableEvents, string | symbol>>(event: TEventKey, listener: (...args: TPluggableEvents[TEventKey]) => void): this;
   /** @internal */
-  removeAllListeners(eventName?: string | symbol): this;
+  removeAllListeners(event?: Extract<keyof TPluggableEvents, string | symbol>): this;
 }
 //#endregion
 //#region src/subscribers/types/Subscriptions.d.ts
@@ -247,7 +245,7 @@ type SubscriptionKey = keyof AllSubscriptions;
  */
 type SubscriptionData<KeyOfSubscribers extends SubscriptionKey> = AllSubscriptions[KeyOfSubscribers];
 /**
- * Event map for Bus, compatible with StrictEventEmitter.
+ * Event map for Bus, compatible with TypedEventEmitter.
  *
  * @internal
  */
@@ -454,6 +452,11 @@ declare class Bot extends Plugin<BotEvents> {
   emit<TKey extends keyof ClientEvents>(event: 'any:event', name: TKey, ...args: ClientEvents[TKey]): boolean;
   /** @internal */
   emit<TEventKey extends keyof BotEvents>(event: TEventKey, ...args: BotEvents[TEventKey]): boolean;
+  /** @internal */
+  emitSafe<TKey extends keyof ClientEvents>(event: 'any:event', name: TKey, ...args: ClientEvents[TKey]): boolean;
+  /** @internal */
+  emitSafe<TEventKey extends keyof BotEvents>(event: TEventKey, ...args: BotEvents[TEventKey]): boolean;
+  protected onListenerError(error: unknown, event: string | symbol): void;
 }
 //#endregion
 //#region src/handlers/BaseHandler.d.ts
@@ -473,7 +476,8 @@ declare abstract class BaseHandler<ValidEvent extends ValidEventTypes> implement
   readonly core: Core;
   protected readonly event: ValidEvent;
   protected readonly logger: Logger;
-  protected constructor(event: ValidEvent, core: Core);
+  protected readonly dispatch?: DispatchContext | undefined;
+  protected constructor(event: ValidEvent, core: Core, dispatch?: DispatchContext);
   /**
    * Holds the main logic of your handler. The dispatcher calls it after the handler's gates pass, so a
    * gate that refuses stops `execute()` from running.
@@ -895,7 +899,7 @@ type GateContext = InteractionGateContext | EventGateContext;
  * @typeParam Repliable - The interaction type this handler processes
  */
 declare abstract class InteractionHandler<Repliable extends Repliables> extends BaseHandler<Repliable> implements Handler {
-  constructor(event: Repliable, core: Core);
+  constructor(event: Repliable, core: Core, dispatch?: DispatchContext);
 }
 //#endregion
 //#region src/bot/gates/matching.d.ts
@@ -1013,7 +1017,7 @@ type FocusedArms<Route extends keyof SlashOptionRegistry, Ret> = { [Name in Auto
  * ```
  */
 declare abstract class AutocompleteHandler<Route extends keyof SlashOptionRegistry, Cache extends CacheType = 'cached'> extends BaseHandler<AutocompleteInteraction<Cache>> implements Handler {
-  constructor(event: AutocompleteInteraction<Cache>, core: Core);
+  constructor(event: AutocompleteInteraction<Cache>, core: Core, dispatch?: DispatchContext);
   /**
    * The focused option for this interaction. `value` is always the raw partial string the user is typing,
    * even for an integer or number option, so coerce it yourself when you need a number.
@@ -1096,6 +1100,12 @@ type Row<Route extends keyof SlashOptionRegistry> = SlashOptionRegistry[Route];
 type NamesOfKind<Route extends keyof SlashOptionRegistry, Kind extends OptionKind> = { [Name in keyof Row<Route>]: Row<Route>[Name] extends {
   kind: Kind;
 } ? Name : never }[keyof Row<Route>];
+type ChannelWireType<Types extends number> = Types extends ChannelType.PublicThread | ChannelType.AnnouncementThread ? ChannelType.PublicThread | ChannelType.AnnouncementThread : Types;
+type ResolvedChannel<Cache extends CacheType, Entry> = Entry extends {
+  channelTypes: readonly (infer Types extends number)[];
+} ? Extract<NonNullable<CommandInteractionOption<Cache>['channel']>, {
+  type: ChannelWireType<Types>;
+}> : NonNullable<CommandInteractionOption<Cache>['channel']>;
 type ResolvedValue<Cache extends CacheType, Entry> = Entry extends {
   choices: readonly (infer Choice)[];
 } ? Choice : Entry extends {
@@ -1108,7 +1118,7 @@ type ResolvedValue<Cache extends CacheType, Entry> = Entry extends {
   kind: 'user';
 } ? NonNullable<CommandInteractionOption<Cache>['user']> : Entry extends {
   kind: 'channel';
-} ? NonNullable<CommandInteractionOption<Cache>['channel']> : Entry extends {
+} ? ResolvedChannel<Cache, Entry> : Entry extends {
   kind: 'role';
 } ? NonNullable<CommandInteractionOption<Cache>['role']> : Entry extends {
   kind: 'mentionable';
@@ -1128,8 +1138,8 @@ type MemberGetter<Route extends keyof SlashOptionRegistry, Cache extends CacheTy
  * on required options, narrows `choices` to their literal union, and only appears when the route has an
  * option of that kind. The rich kinds return exactly what the djs resolver returns.
  *
- * Pass the raw `this.event.options` resolver for anything this view does not cover, such as narrowing a
- * channel option with `getChannel(name, channelTypes)`.
+ * A channel option declared with `addChannelTypes` narrows `getChannel` to the matching channel subtype.
+ * Pass the raw `this.event.options` resolver for anything this view does not cover.
  *
  * @typeParam Route - A route key from the generated {@link SlashOptionRegistry}.
  * @typeParam Cache - The interaction cache state, `'cached'` by default.

package/dist/index.mjs

@@ -1,14 +1,15 @@
 import "reflect-metadata";
-import { BuilderComponent, CustomId, Fault, Notice, RegisterCommand, RowComponent, Silence, defineGate, paginate } from "@seedcord/core";
-import { CommandMetadataKey, ComponentDefsKey, EventMetadataKey, GateNotice, GatedMetadataKey, InteractionMetadataKey, InteractionRouteKeys, InteractionRoutes, MiddlewareMetadataKey, NotInGuild, NoticeCard, PAGE_MAX, SubscribeMetadataKey, decodeFor, pageCursor, pickNotice, prefixOf, runHandlerGates, setBotColor } from "@seedcord/core/internal";
+import { BuilderComponent, CustomId, DispatchContext, Fault, Notice, RegisterCommand, RowComponent, Silence, defineGate, paginate } from "@seedcord/core";
+import { CommandMetadataKey, ComponentDefsKey, EventMetadataKey, GateNotice, GatedMetadataKey, InteractionMetadataKey, InteractionRouteKeys, InteractionRoutes, MiddlewareMetadataKey, NotInGuild, NoticeCard, PAGE_MAX, SubscribeMetadataKey, decodeFor, pageCursor, pickNotice, prefixOf, routeIdOf, runHandlerGates, setBotColor } from "@seedcord/core/internal";
 import { ApplicationCommandType, AttachmentBuilder, ButtonStyle, Client, Collection, ComponentType, DiscordAPIError, Events, Guild, GuildMember, Message, MessageFlags, PermissionFlagsBits, RESTJSONErrorCodes, Role, SeparatorSpacingSize, SnowflakeUtil, TextChannel, User, WebhookClient, chatInputApplicationCommandMention } from "discord.js";
 import { SeedcordErrorCode } from "@seedcord/errors";
 import { SeedcordError, SeedcordRangeError, SeedcordTypeError, validateDiscordToken } from "@seedcord/errors/internal";
 import { filterCirculars, formatFilePath, hasKeys, prettify, traverseDirectory } from "@seedcord/utils";
-import { CoordinatedShutdown, CoordinatedStartup, HealthCheck, Logger, ShutdownPhase, StartupPhase, StrictEventEmitter } from "@seedcord/services";
+import { CoordinatedShutdown, CoordinatedStartup, HealthCheck, Logger, ShutdownPhase, StartupPhase } from "@seedcord/services";
 import chalk from "chalk";
 import { ActionRowBuilder, ButtonBuilder, ContextMenuCommandBuilder, SlashCommandBuilder, TextDisplayBuilder } from "@discordjs/builders";
 import { buildSlashRoute, routeLeavesOf } from "@seedcord/utils/internal";
+import { TypedEventEmitter } from "@seedcord/event-emitter";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -25,6 +26,8 @@ export * from "@seedcord/utils"
 
 export * from "@seedcord/services"
 
+export * from "@seedcord/event-emitter"
+
 export * from "@seedcord/rate-limiter"
 
 //#region src/bot/decorators/Events.ts
@@ -1245,7 +1248,7 @@ function getDevChannel() {
 * Extend this class to create plugins that integrate with the Seedcord lifecycle.
 * Plugins have access to the core instance and must implement initialization logic.
 */
-var Plugin = class extends StrictEventEmitter {
+var Plugin = class extends TypedEventEmitter {
 	pluggable;
 	name = this.constructor.name;
 	constructor(pluggable) {
@@ -1267,16 +1270,12 @@ var Plugin = class extends StrictEventEmitter {
 		getDevChannel()?.send("seedcord:register-critical-files", { patterns });
 	}
 	/** @internal */
-	setMaxListeners(n) {
-		return super.setMaxListeners(n);
-	}
-	/** @internal */
 	removeListener(event, listener) {
 		return super.removeListener(event, listener);
 	}
 	/** @internal */
-	removeAllListeners(eventName) {
-		return super.removeAllListeners(eventName);
+	removeAllListeners(event) {
+		return super.removeAllListeners(event);
 	}
 };
 /**
@@ -1285,7 +1284,7 @@ var Plugin = class extends StrictEventEmitter {
 * Provides plugin attachment capabilities and lifecycle management. Plugins are attached during
 * configuration and initialized during startup. Not constructed directly, the host is a {@link Seedcord}.
 */
-var Pluggable = class Pluggable extends StrictEventEmitter {
+var Pluggable = class Pluggable extends TypedEventEmitter {
 	isInitialized = false;
 	shutdown;
 	startup;
@@ -1338,16 +1337,12 @@ var Pluggable = class Pluggable extends StrictEventEmitter {
 		return Object.assign(this, entry);
 	}
 	/** @internal */
-	setMaxListeners(n) {
-		return super.setMaxListeners(n);
-	}
-	/** @internal */
 	removeListener(event, listener) {
 		return super.removeListener(event, listener);
 	}
 	/** @internal */
-	removeAllListeners(eventName) {
-		return super.removeAllListeners(eventName);
+	removeAllListeners(event) {
+		return super.removeAllListeners(event);
 	}
 };
 
@@ -1360,10 +1355,12 @@ var BaseHandler = class {
 	core;
 	event;
 	logger;
-	constructor(event, core) {
+	dispatch;
+	constructor(event, core, dispatch) {
 		this.core = core;
 		this.event = event;
 		this.logger = new Logger(this.constructor.name);
+		this.dispatch = dispatch;
 	}
 	/** @internal */
 	getEvent() {
@@ -1399,8 +1396,8 @@ var InteractionMiddleware = class extends BaseHandler {
 * @typeParam Repliable - The interaction type this handler processes
 */
 var InteractionHandler = class extends BaseHandler {
-	constructor(event, core) {
-		super(event, core);
+	constructor(event, core, dispatch) {
+		super(event, core, dispatch);
 	}
 };
 
@@ -1545,8 +1542,8 @@ var ContextMenuHandler = class extends InteractionHandler {
 * ```
 */
 var AutocompleteHandler = class extends BaseHandler {
-	constructor(event, core) {
-		super(event, core);
+	constructor(event, core, dispatch) {
+		super(event, core, dispatch);
 	}
 	/**
 	* The focused option for this interaction. `value` is always the raw partial string the user is typing,
@@ -2582,7 +2579,8 @@ function interactionGateContext(interaction, core) {
 		guildId: interaction.guildId,
 		channelId: interaction.channelId,
 		memberRoleIds,
-		memberPermissions: interaction.memberPermissions?.bitfield ?? null
+		memberPermissions: interaction.memberPermissions?.bitfield ?? null,
+		routeId: null
 	};
 }
 function eventGateContext(eventName, args, core) {
@@ -2599,7 +2597,8 @@ function eventGateContext(eventName, args, core) {
 		guildId: actor.guild?.id ?? null,
 		channelId: actor.channelId,
 		memberRoleIds: actor.member ? [...actor.member.roles.cache.keys()].filter((id) => id !== actor.guild?.id) : [],
-		memberPermissions: actor.member?.permissions.bitfield ?? null
+		memberPermissions: actor.member?.permissions.bitfield ?? null,
+		routeId: null
 	};
 }
 
@@ -2973,7 +2972,7 @@ var EventDispatcher = class {
 		const handlerEntries = this.eventMap.get(eventName);
 		this.logger.debug(`Attaching ${chalk.bold.green(eventName)} to the client with ${chalk.gray(handlerEntries?.length ?? 0)} handler(s)`);
 		this.core.bot.client.on(eventName, (...args) => {
-			this.core.bot.emit("any:event", eventName, ...args);
+			this.core.bot.emitSafe("any:event", eventName, ...args);
 			(async () => {
 				await this.processEvent(eventName, args).catch((err) => {
 					this.logger.error(`[${chalk.bold.red("UNHANDLED ERROR AT ROOT")}] ${err.name}`, err.stack);
@@ -3264,7 +3263,7 @@ var InteractionDispatcher = class {
 	}
 	attachToClient() {
 		this.core.bot.client.on(Events.InteractionCreate, (interaction) => {
-			this.core.bot.emit("any:interaction", interaction);
+			this.core.bot.emitSafe("any:interaction", interaction);
 			this.handleInteraction(interaction).catch((err) => {
 				this.logger.error(`[${chalk.bold.red("UNHANDLED ERROR AT ROOT")}] ${err.name}`, err.stack);
 				this.core.bot.emit("error:unhandled:interaction", err);
@@ -3287,7 +3286,8 @@ var InteractionDispatcher = class {
 				HandlerCtor = UnhandledEvent;
 			}
 			this.logger.debug(`Processing ${chalk.bold.green(key)} with ${chalk.gray(HandlerCtor.name)}`);
-			const handler = new HandlerCtor(interaction, this.core);
+			const dispatch = new DispatchContext(routeIdOf(HandlerCtor));
+			const handler = new HandlerCtor(interaction, this.core, dispatch);
 			if (!interaction.isAutocomplete()) await runHandlerGates(HandlerCtor, interactionGateContext(interaction, this.core));
 			await handler.execute();
 		} catch (caught) {
@@ -3478,6 +3478,12 @@ var Bot = class extends Plugin {
 	emit(event, ...args) {
 		return super.emit(event, ...args);
 	}
+	emitSafe(event, ...args) {
+		return super.emitSafe(event, ...args);
+	}
+	onListenerError(error, event) {
+		this.logger.error(`listener for ${String(event)} threw`, error);
+	}
 };
 __decorate([Envapt("DISCORD_BOT_TOKEN", { converter: (raw) => validateDiscordToken(raw) }), __decorateMetadata("design:type", String)], Bot.prototype, "botToken", void 0);
 
@@ -3811,7 +3817,7 @@ var Bus = class extends Plugin {
 //#endregion
 //#region src/version.ts
 /** Package version */
-const version = "0.1.0-next.0";
+const version = "0.1.0-next.1";
 
 //#endregion
 //#region src/Seedcord.ts
@@ -3864,7 +3870,7 @@ var Seedcord = class Seedcord extends Pluggable {
 		this.hmrManager.init();
 		this.bus = new Bus(this);
 		this.bot = new Bot(this);
-		this.rateLimiter = new MemoryRateLimiter();
+		this.rateLimiter = config.store ?? new MemoryRateLimiter();
 		this.healthCheck = new HealthCheck(this.shutdown, config.healthCheck);
 		this.registerStartupTasks();
 	}