@seedcord/gateway 0.1.0-next.3 → 0.1.0-next.4

package/dist/index.mjs

@@ -9,15 +9,15 @@ import { ActionRowBuilder, ButtonBuilder, ContextMenuCommandBuilder, SlashComman
 import { buildSlashRoute, routeLeavesOf } from "@seedcord/utils/internal";
 import { ApplicationCommandType, ButtonStyle, Client, Collection, ComponentType, DiscordAPIError, Events, Guild, GuildMember, Message, MessageFlags, PermissionFlagsBits, RESTJSONErrorCodes, Role, TextChannel, User, chatInputApplicationCommandMention } from "discord.js";
 import * as crypto from "node:crypto";
-import { TypedEventEmitter } from "@seedcord/event-emitter";
 import chalk from "chalk";
 import { Converters, Envapter } from "envapt";
 import { MessageFlags as MessageFlags$1, Routes, SeparatorSpacingSize } from "discord-api-types/v10";
 import { filterCirculars, formatFilePath, hasKeys, stripAnsi, timestampFromSnowflake } from "@seedcord/utils";
 import { DiscordAPIError as DiscordAPIError$1, REST } from "@discordjs/rest";
-import { CoordinatedShutdown, CoordinatedStartup, HealthCheck, ShutdownPhase, ShutdownPhase as ShutdownPhase$1, StartupPhase, StartupPhase as StartupPhase$1 } from "@seedcord/core/node";
+import { CoordinatedShutdown, CoordinatedStartup, HealthCheck, Pluggable, ShutdownPhase, StartupPhase, settleWithin } from "@seedcord/core/node/internal";
 import { MemoryRateLimiter } from "@seedcord/rate-limiter";
 import { SeedcordBrand } from "@seedcord/types/internal";
+import { TypedEventEmitter } from "@seedcord/event-emitter";
 import { Envapt } from "envapt/legacy";
 import { resolve } from "node:path";
 import { HmrModuleHandler } from "@seedcord/core/hmr";
@@ -29,12 +29,12 @@ export * from "@seedcord/core"
 
 export * from "@seedcord/logger"
 
-export * from "@seedcord/event-emitter"
-
 export * from "@seedcord/utils"
 
 export * from "@seedcord/rate-limiter"
 
+export * from "@seedcord/event-emitter"
+
 //#region src/logger-bootstrap.ts
 installNodeDefaults();
 
@@ -1124,112 +1124,6 @@ async function getConfirmation(interaction, prompt, options) {
 	return confirmed;
 }
 
-//#endregion
-//#region src/interfaces/Plugin.ts
-/**
-* Base class for Seedcord plugins
-*
-* 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 TypedEventEmitter {
-	pluggable;
-	name = this.constructor.name;
-	constructor(pluggable) {
-		super();
-		this.pluggable = pluggable;
-	}
-	/**
-	* Reloads plugin state on an HMR update. The base implementation is a no-op, override it in your plugin.
-	* @virtual
-	*/
-	onHmr(_event) {
-		return Promise.resolve();
-	}
-	/**
-	* Registers critical file patterns that should trigger a full restart when changed in Dev HMR.
-	* @param patterns - Glob patterns relative to the project root
-	*/
-	registerCriticalFiles(patterns) {
-		getDevChannel()?.send("seedcord:register-critical-files", { patterns });
-	}
-	/** @internal */
-	removeListener(event, listener) {
-		return super.removeListener(event, listener);
-	}
-	/** @internal */
-	removeAllListeners(event) {
-		return super.removeAllListeners(event);
-	}
-};
-/**
-* Base class for objects that can have plugins attached.
-*
-* 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 TypedEventEmitter {
-	isInitialized = false;
-	shutdown;
-	startup;
-	plugins = [];
-	static PLUGIN_INIT_TIMEOUT_MS = 15e3;
-	constructor(shutdown, startup) {
-		super();
-		this.shutdown = shutdown;
-		this.startup = startup;
-	}
-	/** @internal */
-	async init() {
-		if (this.isInitialized) return this;
-		await this.startup.run();
-		this.isInitialized = true;
-		return this;
-	}
-	/**
-	* Attaches a plugin to this instance
-	*
-	* Plugins provide external functionality and are initialized during the specified startup phase.
-	* The plugin instance becomes available as a property in `core` wherever it's available.
-	*
-	* Make sure to augment the {@link Core} interface with the plugin type to ensure TypeScript recognizes it and provides intellisense.
-	*
-	* @typeParam Key - The property name for accessing the plugin
-	* @typeParam Ctor - The plugin constructor type
-	* @param key - Property name to access the plugin instance
-	* @param Plugin - Plugin constructor class
-	* @param startupPhase - When during startup to initialize this plugin ({@link StartupPhase})
-	* @param args - Additional arguments to pass to the plugin constructor
-	* @returns This instance with the plugin attached as a typed property
-	* @throws A **SeedcordError** When called after initialization or if key already exists
-	* @example
-	* ```typescript
-	* seedcord.attach('db', Mongo, StartupPhase.Configuration, { uri: 'mongodb://...', name: 'seedcord', dir: ... })
-	* ```
-	*/
-	attach(key, Plugin, startupPhase, ...args) {
-		if (this.isInitialized) throw new SeedcordError(SeedcordErrorCode.CorePluginAfterInit);
-		if (key in this) throw new SeedcordError(SeedcordErrorCode.CorePluginKeyExists, [key]);
-		const instance = new Plugin(this, ...args);
-		this.plugins.push(instance);
-		const entry = { [key]: instance };
-		this.startup.addTask(startupPhase, `Plugin:${key}`, async () => {
-			instance.logger.utils.initialization(key, "start");
-			await instance.init();
-			instance.logger.utils.initialization(key, "end");
-		}, Pluggable.PLUGIN_INIT_TIMEOUT_MS);
-		return Object.assign(this, entry);
-	}
-	/** @internal */
-	removeListener(event, listener) {
-		return super.removeListener(event, listener);
-	}
-	/** @internal */
-	removeAllListeners(event) {
-		return super.removeAllListeners(event);
-	}
-};
-
 //#endregion
 //#region src/handlers/BaseHandler.ts
 /**
@@ -2275,7 +2169,6 @@ function slashRouteLeaves(commands) {
 var CommandRegistry = class {
 	core;
 	onDeployed;
-	name = "Commands";
 	logger = new Logger("Commands");
 	isInitialised = false;
 	globalCommands = [];
@@ -2571,11 +2464,12 @@ var EventDispatcher = class {
 	core;
 	logger = new Logger("Events");
 	isInitialized = false;
-	name = "Events";
 	eventMap = /* @__PURE__ */ new Map();
 	middlewares = [];
 	executedOnceHandlers = /* @__PURE__ */ new Set();
 	attachedEvents = /* @__PURE__ */ new Set();
+	inFlight = /* @__PURE__ */ new Set();
+	draining = false;
 	loading = false;
 	loadedHandlers = [];
 	loadedMiddlewares = [];
@@ -2744,15 +2638,22 @@ var EventDispatcher = class {
 		const handlerEntries = this.eventMap.get(eventName);
 		this.logger.debug(`Attaching ${paint.mint.bold(eventName)} to the client with ${paint.mute(handlerEntries?.length ?? 0)} handler(s)`);
 		this.core.bot.client.on(eventName, (...args) => {
+			if (this.draining) return;
 			this.core.bot.emitSafe("any:event", eventName, ...args);
-			(async () => {
-				await this.processEvent(eventName, args).catch((err) => {
-					this.logger.error(`[${paint.coral.bold("UNHANDLED ERROR AT ROOT")}] ${err.name}`, err.stack);
-					this.core.bot.emit("error:unhandled:event", err);
-				});
-			})();
+			const run = this.processEvent(eventName, args).catch((err) => {
+				this.logger.error(`[${paint.coral.bold("UNHANDLED ERROR AT ROOT")}] ${err.name}`, err.stack);
+				this.core.bot.emit("error:unhandled:event", err);
+			});
+			this.inFlight.add(run);
+			run.finally(() => this.inFlight.delete(run));
 		});
 	}
+	stopAccepting() {
+		this.draining = true;
+	}
+	drain(timeoutMs) {
+		return settleWithin(Promise.allSettled(this.inFlight), timeoutMs);
+	}
 	async processEvent(eventName, args) {
 		const handlerEntries = this.eventMap.get(eventName);
 		if (!handlerEntries || handlerEntries.length === 0) return;
@@ -2878,7 +2779,6 @@ var InteractionDispatcher = class {
 	core;
 	logger = new Logger("Interactions");
 	isInitialized = false;
-	name = "Interactions";
 	slashMap = /* @__PURE__ */ new Map();
 	buttonMap = /* @__PURE__ */ new Map();
 	modalMap = /* @__PURE__ */ new Map();
@@ -2892,6 +2792,8 @@ var InteractionDispatcher = class {
 	autocompleteMap = /* @__PURE__ */ new Map();
 	keysToIgnore = /* @__PURE__ */ new Set();
 	middlewares = [];
+	inFlight = /* @__PURE__ */ new Set();
+	draining = false;
 	loading = false;
 	loadedHandlers = [];
 	loadedMiddlewares = [];
@@ -3092,13 +2994,22 @@ var InteractionDispatcher = class {
 	}
 	attachToClient() {
 		this.core.bot.client.on(Events.InteractionCreate, (interaction) => {
+			if (this.draining) return;
 			this.core.bot.emitSafe("any:interaction", interaction);
-			this.handleInteraction(interaction).catch((err) => {
+			const run = this.handleInteraction(interaction).catch((err) => {
 				this.logger.error(`[${paint.coral.bold("UNHANDLED ERROR AT ROOT")}] ${err.name}`, err.stack);
 				this.core.bot.emit("error:unhandled:interaction", err);
 			});
+			this.inFlight.add(run);
+			run.finally(() => this.inFlight.delete(run));
 		});
 	}
+	stopAccepting() {
+		this.draining = true;
+	}
+	drain(timeoutMs) {
+		return settleWithin(Promise.allSettled(this.inFlight), timeoutMs);
+	}
 	async handleCustomIdInteraction(interaction, getMap, interactionType) {
 		if ([...this.keysToIgnore].some((matcher) => matcher.owns(interaction.customId))) return;
 		const prefix = prefixOf(interaction.customId);
@@ -3226,23 +3137,25 @@ function __decorate(decorators, target, key, desc) {
 
 //#endregion
 //#region src/bot/Bot.ts
+const DISPATCH_DRAIN_TIMEOUT_MS = 5e3;
+const DRAIN_TASK_TIMEOUT_MS = 6e3;
+const UNBIND_TIMEOUT_MS = 2e3;
+const LOGOUT_TIMEOUT_MS = 2e3;
 /**
-* Discord bot implementation that manages client and controllers
-*
-* Don't instantiate this class directly. Use `core.bot` instead.
+* The Discord client and its controllers. Access it through `core.bot`.
 */
-var Bot = class extends Plugin {
+var Bot = class extends TypedEventEmitter {
 	/** @internal */
 	logger = new Logger("Bot");
 	isInitialized = false;
 	_client;
 	interactions;
 	events;
-	commands;
 	emojiInjector;
+	commands;
 	emojis = Emojis;
 	mentions = CommandMentions;
-	/** @internal For use in dev mode */
+	/** @internal */
 	async onHmr(event) {
 		if (this.interactions) await this.interactions.onHmr(event);
 		if (this.events) await this.events.onHmr(event);
@@ -3250,7 +3163,7 @@ var Bot = class extends Plugin {
 	}
 	/** @internal */
 	constructor(core) {
-		super(core);
+		super();
 		this._client = new Client(core.config.bot.clientOptions);
 		if (core.config.bot.interactions.path) this.interactions = new InteractionDispatcher(core);
 		if (core.config.bot.events.path) this.events = new EventDispatcher(core);
@@ -3261,12 +3174,24 @@ var Bot = class extends Plugin {
 			});
 		}
 		this.emojiInjector = new EmojiInjector(core);
-		core.shutdown.addTask(ShutdownPhase$1.DiscordCleanup, "stop-bot", async () => await this.stop(), 2e3);
+		this.registerShutdownTasks(core);
 	}
-	/**
-	* Initializes Discord client and all controllers
-	* @internal
-	*/
+	registerShutdownTasks(core) {
+		core.shutdown.addTask(ShutdownPhase.Unbind, "stop-dispatch", () => {
+			this.stopAccepting();
+			return Promise.resolve();
+		}, UNBIND_TIMEOUT_MS);
+		core.shutdown.addTask(ShutdownPhase.Drain, "drain-dispatch", () => this.drain(), DRAIN_TASK_TIMEOUT_MS);
+		core.shutdown.addTask(ShutdownPhase.Logout, "stop-bot", async () => await this.stop(), LOGOUT_TIMEOUT_MS);
+	}
+	stopAccepting() {
+		this.interactions?.stopAccepting();
+		this.events?.stopAccepting();
+	}
+	async drain() {
+		await Promise.allSettled([this.interactions?.drain(DISPATCH_DRAIN_TIMEOUT_MS), this.events?.drain(DISPATCH_DRAIN_TIMEOUT_MS)]);
+	}
+	/** @internal */
 	async init() {
 		if (this.isInitialized) return;
 		this.isInitialized = true;
@@ -3282,17 +3207,11 @@ var Bot = class extends Plugin {
 			this.interactions?.warnUnhandledContextMenuRoutes(this.commands.contextMenuLeaves());
 		}
 	}
-	/**
-	* Stops the bot and cleans up connections
-	* @internal
-	*/
+	/** @internal */
 	async stop() {
 		this._client.removeAllListeners();
 		await this.logout();
 	}
-	/**
-	* Logs the bot into Discord using the configured token
-	*/
 	async login(token) {
 		this._client.once(Events.ClientReady, () => this.emit("ready"));
 		this._client.login(token);
@@ -3300,9 +3219,6 @@ var Bot = class extends Plugin {
 		this.logger.info(`Logged in as ${chalk.bold.magenta(this._client.user?.username)}!`);
 		return this;
 	}
-	/**
-	* Logs out and destroys the Discord client connection
-	*/
 	async logout() {
 		await this._client.destroy();
 		this.logger.info(chalk.bold.red("Logged out of Discord!"));
@@ -3310,6 +3226,12 @@ var Bot = class extends Plugin {
 	get client() {
 		return this._client;
 	}
+	/**
+	* The overloads enforce the key/args correlation at compile time only. At runtime this forwards
+	* straight to the underlying TypedEventEmitter.
+	*
+	* @internal
+	*/
 	emit(event, ...args) {
 		return super.emit(event, ...args);
 	}
@@ -3403,18 +3325,16 @@ var UnhandledErrorContainer = class extends BuilderComponent {
 * Registers and dispatches subscribers. Subscribers load from the configured directories and run
 * on a programmatic or framework-event publish. Accessed via `core.bus`. Do not construct it directly.
 */
-var Bus = class extends Plugin {
+var Bus = class extends TypedEventEmitter {
 	core;
 	logger = new Logger("Subscribers");
-	/** @internal */
-	name = "Subscribers";
 	isInitialized = false;
 	subscribersMap = /* @__PURE__ */ new Map();
 	executedOnceHandlers = /* @__PURE__ */ new Set();
 	webhookProbes = /* @__PURE__ */ new Map();
 	hmrHandler;
 	constructor(core) {
-		super(core);
+		super();
 		this.core = core;
 		if (this.core.config.subscribers.path) {
 			if (!Envapter.isDevelopment && !Envapter.isTest) return;
@@ -3543,15 +3463,13 @@ var Bus = class extends Plugin {
 //#endregion
 //#region src/version.ts
 /** Package version */
-const version = "0.1.0-next.3";
+const version = "0.1.0-next.4";
 
 //#endregion
 //#region src/Seedcord.ts
 /**
-* Main Seedcord bot framework class
-*
-* Primary entry point for creating Discord bots with Seedcord.
-* Manages component lifecycle and provides plugin support.
+* The gateway bot host. Opens a discord.js gateway session, discovers handlers, and runs
+* coordinated startup and shutdown. Attach plugins with `attach()`.
 */
 var Seedcord = class Seedcord extends Pluggable {
 	config;
@@ -3561,7 +3479,6 @@ var Seedcord = class Seedcord extends Pluggable {
 	augmentTarget = "@seedcord/gateway";
 	/** @internal */
 	version = version;
-	static isInstantiated = false;
 	healthCheck;
 	hmrManager;
 	/** @see {@link CoordinatedShutdown} */
@@ -3575,15 +3492,11 @@ var Seedcord = class Seedcord extends Pluggable {
 	/** @see {@link IRateLimiter} */
 	rateLimiter;
 	/**
-	* Creates a new Seedcord instance
-	*
 	* @param config - Bot configuration including paths and Discord client options
 	* @throws A **SeedcordError** When attempting to create multiple instances (singleton)
 	*/
 	constructor(config) {
-		if (Seedcord.isInstantiated) throw new SeedcordError(SeedcordErrorCode.CoreSingletonViolation);
-		Seedcord.isInstantiated = true;
-		const shutdown = new CoordinatedShutdown(config.shutdownEnabled);
+		const shutdown = new CoordinatedShutdown();
 		const startup = new CoordinatedStartup();
 		super(shutdown, startup);
 		this.config = config;
@@ -3596,46 +3509,60 @@ var Seedcord = class Seedcord extends Pluggable {
 		this.bus = new Bus(this);
 		this.bot = new Bot(this);
 		this.rateLimiter = config.store ?? new MemoryRateLimiter();
-		this.healthCheck = new HealthCheck(this.shutdown, config.healthCheck);
+		this.healthCheck = HealthCheck.fromOption(this.shutdown, config.healthCheck);
 		this.registerStartupTasks();
 	}
 	/** The bot's discord username, populated after login. */
 	get username() {
 		return this.bot.client.user?.username;
 	}
+	pluginCapabilities() {
+		return {
+			client: this.bot.client,
+			token: this.bot.botToken,
+			rest: this.bot.client.rest
+		};
+	}
 	static reset() {
-		Seedcord.isInstantiated = false;
+		super.reset();
 		LoggerChannelRegistry.instance.reset();
 	}
 	registerStartupTasks() {
 		if (Envapter.isDevelopment || Envapter.isTest) this.registerHmrAwareModules();
-		this.startup.addTask(StartupPhase$1.Configuration, "Bus Initialization", async () => {
+		this.startup.addTask(StartupPhase.Configuration, "Bus Initialization", async () => {
 			this.bus.logger.utils.initialization("Subscribers", "start");
 			await this.bus.init();
 			this.bus.logger.utils.initialization("Subscribers", "end");
 		});
-		this.startup.addTask(StartupPhase$1.Instantiation, "Bot Initialization", async () => {
+		this.startup.addTask(StartupPhase.Login, "Bot Initialization", async () => {
 			this.bot.logger.utils.initialization("Bot", "start");
 			await this.bot.init();
 			this.bot.logger.utils.initialization("Bot", "end");
 		});
-		this.startup.addTask(StartupPhase$1.Ready, "Health Check", async () => {
-			this.healthCheck.logger.utils.initialization("HealthCheck", "start");
-			await this.healthCheck.init();
-			this.healthCheck.logger.utils.initialization("HealthCheck", "end");
+		const { healthCheck } = this;
+		if (healthCheck) this.startup.addTask(StartupPhase.Ready, "Health Check", async () => {
+			healthCheck.logger.utils.initialization("HealthCheck", "start");
+			await healthCheck.init();
+			healthCheck.logger.utils.initialization("HealthCheck", "end");
 		});
 	}
 	/**
 	* Starts the bot and runs all initialization tasks
 	*
-	* @returns This Seedcord instance when fully initialized
+	* @returns This Seedcord instance when initialized
 	*/
 	async start() {
-		await super.init();
+		try {
+			await super.init();
+		} catch (caught) {
+			await this.shutdown.run(1, false);
+			Seedcord.reset();
+			throw caught;
+		}
 		return this;
 	}
 	registerHmrAwareModules() {
-		this.startup.addTask(StartupPhase$1.Configuration, "HMR Registration", async () => {
+		this.startup.addTask(StartupPhase.Configuration, "HMR Registration", async () => {
 			this.hmrManager.register(this.bot);
 			this.hmrManager.register(this.bus);
 			for (const plugin of this.plugins) this.hmrManager.register(plugin);
@@ -3645,5 +3572,5 @@ var Seedcord = class Seedcord extends Pluggable {
 };
 
 //#endregion
-export { ArraySource, AutocompleteHandler, ButtonHandler, CommandMentions, ContextMenuHandler, CursorSource, Emojis, EventHandler, EventMiddleware, Gated, IgnoreBots, InteractionHandler, InteractionMiddleware, Middleware, MiddlewareType, ModalHandler, Nsfw, Paginator, Pluggable, Plugin, RegisterEvent, RepliableHandler, Seedcord, SelectMenuHandler, ShutdownPhase, SlashHandler, StartupPhase, Subscribe, Subscriber, WebhookLog, WebhookUrl, checkBotPermissions, checkPermissions, fetchGuildMember, fetchManyGuildMembers, fetchManyUsers, fetchRole, fetchText, fetchUser, getBotRole, getConfirmation, hasPermsToAssign, updateMemberRoles, version };
+export { ArraySource, AutocompleteHandler, ButtonHandler, CommandMentions, ContextMenuHandler, CursorSource, Emojis, EventHandler, EventMiddleware, Gated, IgnoreBots, InteractionHandler, InteractionMiddleware, Middleware, MiddlewareType, ModalHandler, Nsfw, Paginator, RegisterEvent, RepliableHandler, Seedcord, SelectMenuHandler, SlashHandler, Subscribe, Subscriber, WebhookLog, WebhookUrl, checkBotPermissions, checkPermissions, fetchGuildMember, fetchManyGuildMembers, fetchManyUsers, fetchRole, fetchText, fetchUser, getBotRole, getConfirmation, hasPermsToAssign, updateMemberRoles, version };
 //# sourceMappingURL=index.mjs.map