@seedcord/gateway 0.5.0 → 0.5.1

package/dist/index.mjs

@@ -10,7 +10,7 @@ import { ButtonBuilder, TextDisplayBuilder } from "@discordjs/builders";
 import { buildSlashRoute } from "@seedcord/utils/internal";
 import { Plugin as Plugin$1 } from "@seedcord/core/plugin";
 import { CoordinatedShutdown, CoordinatedStartup, Pluggable } from "@seedcord/core/node";
-import { CommandRegistry, HealthCheck, ShutdownPhase, StartupPhase, SubscriberLoader, settleWithin, shutdownOf } from "@seedcord/core/node/internal";
+import { CommandRegistry, DRAIN_TASK_TIMEOUT_MS, DRAIN_WINDOW_MS, HealthCheck, ShutdownPhase, StartupPhase, SubscriberLoader, drainInFlight, shutdownOf } from "@seedcord/core/node/internal";
 import { MemoryRateLimiter } from "@seedcord/rate-limiter";
 import { HostAugmentTarget, HostVersion, SeedcordBrand } from "@seedcord/types/internal";
 import { Envapter } from "envapt";
@@ -1589,10 +1589,10 @@ function extractErrorResponse(error, core, origin) {
 		};
 	}
 	reportRawFault(error, core, origin, uuid);
-	const override = core.config.errors?.defaultError;
+	const Override = core.config.errors?.defaultError;
 	return {
 		uuid,
-		response: override ? new override(uuid).render(ctx) : new Fault().render(ctx)
+		response: Override ? new Override(uuid).render(ctx) : new Fault().render(ctx)
 	};
 }
 function reportFault(denial, core, origin, uuid) {
@@ -1844,12 +1844,12 @@ var EventDispatcher = class {
 		});
 	}
 	async runMiddlewares(eventName, args) {
-		for (const { ctor, events } of this.middlewares) {
+		for (const { ctor: Middleware, events } of this.middlewares) {
 			if (events && !events.includes(eventName)) continue;
 			try {
-				await new ctor(args, this.core, eventName).execute();
+				await new Middleware(args, this.core, eventName).execute();
 			} catch (caught) {
-				handleEventFault(caught, String(eventName), ctor.name, args, this.core);
+				handleEventFault(caught, String(eventName), Middleware.name, args, this.core);
 				return false;
 			}
 		}
@@ -1915,7 +1915,7 @@ var EventDispatcher = class {
 		this.draining = true;
 	}
 	drain(timeoutMs) {
-		return settleWithin(Promise.allSettled(this.inFlight), timeoutMs);
+		return drainInFlight(this.inFlight, timeoutMs, this.logger, "Events");
 	}
 	async processEvent(eventName, args) {
 		const handlerEntries = this.eventMap.get(eventName);
@@ -1931,15 +1931,15 @@ var EventDispatcher = class {
 			await this.processHandler(eventName, entry.ctor, args);
 		}
 	}
-	async processHandler(eventName, ctor, args) {
+	async processHandler(eventName, Ctor, args) {
 		try {
-			this.logger.debug(`Processing ${paint.sky.bold(eventName)} with ${paint.mute(ctor.name)}`);
-			const handler = new ctor(args, this.core, eventName);
+			this.logger.debug(`Processing ${paint.sky.bold(eventName)} with ${paint.mute(Ctor.name)}`);
+			const handler = new Ctor(args, this.core, eventName);
 			const eventCtx = eventGateContext(eventName, args, this.core);
-			await runHandlerGates(ctor, eventCtx);
+			await runHandlerGates(Ctor, eventCtx);
 			await handler.execute();
 		} catch (caught) {
-			handleEventFault(caught, String(eventName), ctor.name, args, this.core);
+			handleEventFault(caught, String(eventName), Ctor.name, args, this.core);
 		}
 	}
 };
@@ -2223,7 +2223,7 @@ var InteractionDispatcher = class {
 		this.draining = true;
 	}
 	drain(timeoutMs) {
-		return settleWithin(Promise.allSettled(this.inFlight), timeoutMs);
+		return drainInFlight(this.inFlight, timeoutMs, this.logger, "Interactions");
 	}
 	async handleCustomIdInteraction(interaction, kind) {
 		if ([...this.keysToIgnore].some((matcher) => matcher.owns(interaction.customId))) return;
@@ -2283,7 +2283,7 @@ var InteractionDispatcher = class {
 		return new HandlerCtor(interaction, this.core, dispatch);
 	}
 	async runMiddlewares(interaction) {
-		for (const { ctor } of this.middlewares) await new ctor(interaction, this.core).execute();
+		for (const { ctor: Middleware } of this.middlewares) await new Middleware(interaction, this.core).execute();
 	}
 	async gateRefusal(HandlerCtor, interaction, routeId) {
 		const monitor = slowGateMonitor();
@@ -2396,8 +2396,6 @@ 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;
 const loggerSlot = Symbol("seedcord:bot:logger");
@@ -2460,7 +2458,7 @@ var Bot = class {
 		this.#events?.stopAccepting();
 	}
 	async #drain() {
-		await Promise.allSettled([this.#interactions?.drain(DISPATCH_DRAIN_TIMEOUT_MS), this.#events?.drain(DISPATCH_DRAIN_TIMEOUT_MS)]);
+		await Promise.allSettled([this.#interactions?.drain(DRAIN_WINDOW_MS), this.#events?.drain(DRAIN_WINDOW_MS)]);
 	}
 	/** @internal */
 	async [initSlot]() {
@@ -2510,7 +2508,7 @@ function initBot(bot) {
 //#endregion
 //#region src/version.ts
 /** Package version */
-const version = "0.5.0";
+const version = "0.5.1";
 
 //#endregion
 //#region src/Seedcord.ts
@@ -2546,7 +2544,7 @@ var Seedcord = class Seedcord extends Pluggable {
 	* @throws A **SeedcordError** When attempting to create multiple instances (singleton)
 	*/
 	constructor(config) {
-		super(new CoordinatedShutdown(), new CoordinatedStartup());
+		super(new CoordinatedShutdown(config.lifecycle?.shutdownDeadline), new CoordinatedStartup());
 		this.config = config;
 		installNodeDefaults(config.logger);
 		setBotColor(config.botColor);