seedcord 0.15.0 → 0.16.0-next.0

package/dist/index.cjs

@@ -1774,6 +1774,16 @@ async function getConfirmation(interaction, prompt, options) {
 	return confirmed;
 }
 
+//#endregion
+//#region src/hmr/devChannel.ts
+let channel;
+function setDevChannel(next) {
+	channel = next;
+}
+function getDevChannel() {
+	return channel;
+}
+
 //#endregion
 //#region src/interfaces/Plugin.ts
 /**
@@ -1790,9 +1800,8 @@ var Plugin = class extends _seedcord_services.StrictEventEmitter {
 		this.pluggable = pluggable;
 	}
 	/**
-	* Reloads plugin state on an HMR update.
-	* @param _event - The HMR update event
-	* @virtual Override this method to handle HMR updates
+	* 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();
@@ -1802,7 +1811,7 @@ var Plugin = class extends _seedcord_services.StrictEventEmitter {
 	* @param patterns - Glob patterns relative to the project root
 	*/
 	registerCriticalFiles(patterns) {
-		if ({}.hot) ({}).hot.send("seedcord:register-critical-files", { patterns });
+		getDevChannel()?.send("seedcord:register-critical-files", { patterns });
 	}
 	/** @internal */
 	setMaxListeners(n) {
@@ -2718,15 +2727,7 @@ var HmrModuleHandler = class {
 			...options,
 			logger: options.logger.inChannel("hmr")
 		};
-		if ({}.hot) {
-			const data = {}.hot.data;
-			data.hmr ??= {};
-			this.store = data.hmr[this.options.name] = data.hmr[this.options.name] ?? {
-				fileToHandlers: /* @__PURE__ */ new Map(),
-				fileToMiddlewares: /* @__PURE__ */ new Map(),
-				handlerArtifacts: /* @__PURE__ */ new Map()
-			};
-		} else this.store = {
+		this.store = {
 			fileToHandlers: /* @__PURE__ */ new Map(),
 			fileToMiddlewares: /* @__PURE__ */ new Map(),
 			handlerArtifacts: /* @__PURE__ */ new Map()
@@ -2741,6 +2742,7 @@ var HmrModuleHandler = class {
 	async handle(event) {
 		const { file, affectedModules, type } = event;
 		const { logger, handlersDir, middlewaresDir } = this.options;
+		const rollbackEnabled = event.rollback ?? true;
 		if (type === "delete" || type === "deleteDir") {
 			this.unload(file);
 			return;
@@ -2759,10 +2761,19 @@ var HmrModuleHandler = class {
 			const isHandler = fileToReload.startsWith(absHandlersDir);
 			const isMiddleware = absMiddlewaresDir ? fileToReload.startsWith(absMiddlewaresDir) : false;
 			if (!isHandler && !isMiddleware) continue;
-			this.unload(fileToReload);
-			await this.reloadFile(fileToReload);
+			await this.reloadWithRollback(fileToReload, rollbackEnabled);
 		}
 	}
+	async reloadWithRollback(file, rollbackEnabled) {
+		const { logger } = this.options;
+		const snapshot = this.snapshotUnits(file);
+		this.unload(file);
+		if (await this.reloadFile(file)) return;
+		this.unload(file);
+		if (!rollbackEnabled) return;
+		this.restoreUnits(file, snapshot);
+		logger.warn(`${chalk.default.yellow.bold("Rolled back")} ${chalk.default.gray((0, _seedcord_utils.formatFilePath)(file))} to the last-good version`);
+	}
 	/**
 	* Tracks a handler module as being loaded from a specific file.
 	* @param file - The file path the handler was loaded from.
@@ -2823,7 +2834,7 @@ var HmrModuleHandler = class {
 		const { logger, isHandler, isMiddleware, registerHandler, registerMiddleware } = this.options;
 		if (!(0, node_fs.existsSync)(file)) {
 			logger.info(`File does not exist, skipping reload: ${(0, _seedcord_utils.formatFilePath)(file)}`);
-			return;
+			return false;
 		}
 		try {
 			let fileUrl = (0, node_url.pathToFileURL)(file).href;
@@ -2840,8 +2851,26 @@ var HmrModuleHandler = class {
 				const name = val.name ?? "Middleware";
 				logger.info(`${chalk.default.blue.bold("Reloaded")} ${chalk.default.cyan.bold(name)} from ${chalk.default.gray((0, _seedcord_utils.formatFilePath)(file))}`);
 			}
+			return true;
 		} catch (error) {
 			logger.error(`Failed to reload file: ${file}`, error);
+			return false;
+		}
+	}
+	snapshotUnits(file) {
+		return {
+			handlers: Array.from(this.store.fileToHandlers.get(file) ?? []),
+			middlewares: Array.from(this.store.fileToMiddlewares.get(file) ?? [])
+		};
+	}
+	restoreUnits(file, snapshot) {
+		for (const handler of snapshot.handlers) {
+			this.options.registerHandler(handler, file);
+			this.trackHandler(file, handler);
+		}
+		if (this.options.registerMiddleware) for (const middleware of snapshot.middlewares) {
+			this.options.registerMiddleware(middleware, file);
+			this.trackMiddleware(file, middleware);
 		}
 	}
 };
@@ -2895,7 +2924,7 @@ function slashRouteLeaves(commands) {
 * Manages Discord application command registration and deployment.
 *
 * Scans command directories, builds command structures, and registers both global and guild-scoped commands
-* to Discord's API. Accessed via `core.bot.commands`, not constructed directly.
+* to Discord's API. Accessed via `core.bot.commands`. Do not construct it directly.
 */
 var CommandRegistry = class {
 	core;
@@ -2920,8 +2949,7 @@ var CommandRegistry = class {
 			registerHandler: this.registerCommand.bind(this),
 			unregisterHandler: this.unregisterCommand.bind(this),
 			getArtifacts: this.getArtifacts.bind(this),
-			logger: this.logger,
-			name: "Commands"
+			logger: this.logger
 		});
 	}
 	getArtifacts(ctor) {
@@ -2939,7 +2967,7 @@ var CommandRegistry = class {
 			global: this.globalCommands.length,
 			"guild groups": this.guildCommands.size
 		});
-		if ({}.hot) ({}).hot.on("seedcord:refresh-commands", (data) => {
+		getDevChannel()?.on("seedcord:refresh-commands", (data) => {
 			this.refresh(data.shouldRefresh);
 		});
 	}
@@ -2961,7 +2989,7 @@ var CommandRegistry = class {
 		if (commandsDir && event.file.startsWith((0, node_path.resolve)(process.cwd(), commandsDir))) {
 			this.pendingEvents.delete(event.file);
 			this.pendingEvents.set(event.file, event);
-			if ({}.hot) ({}).hot.send("seedcord:commands-update-prompt", { files: Array.from(this.pendingEvents.keys()).map((f) => (0, _seedcord_utils.formatFilePath)(f)) });
+			getDevChannel()?.send("seedcord:commands-update-prompt", { files: Array.from(this.pendingEvents.keys()).map((f) => (0, _seedcord_utils.formatFilePath)(f)) });
 		} else await this.hmrHandler?.handle(event);
 	}
 	async loadCommands(dir) {
@@ -3295,8 +3323,7 @@ var EventDispatcher = class {
 			unregisterHandler: this.unregisterHandler.bind(this),
 			unregisterMiddleware: this.unregisterMiddleware.bind(this),
 			getArtifacts: this.getArtifacts.bind(this),
-			logger: this.logger,
-			name: "Event"
+			logger: this.logger
 		});
 	}
 	getArtifacts(ctor) {
@@ -3357,7 +3384,6 @@ var EventDispatcher = class {
 				if (handlers.length === 0) this.eventMap.delete(event);
 			}
 		}
-		this.executedOnceHandlers.delete(handlerClass);
 	}
 	unregisterMiddleware(middlewareCtor) {
 		const index = this.middlewares.findIndex((entry) => entry.ctor === middlewareCtor);
@@ -3441,7 +3467,10 @@ var EventDispatcher = class {
 		if (handlersToExecute.length === 0) return;
 		if (!await this.runMiddlewares(eventName, args)) return;
 		for (const entry of handlersToExecute) {
-			if (entry.frequency === "once") this.executedOnceHandlers.add(entry.ctor);
+			if (entry.frequency === "once") {
+				if (this.executedOnceHandlers.has(entry.ctor)) continue;
+				this.executedOnceHandlers.add(entry.ctor);
+			}
 			await this.processHandler(eventName, entry.ctor, args);
 		}
 	}
@@ -3571,13 +3600,12 @@ var InteractionDispatcher = class {
 			unregisterHandler: this.unregisterHandler.bind(this),
 			unregisterMiddleware: this.unregisterMiddleware.bind(this),
 			getArtifacts: this.getArtifacts.bind(this),
-			logger: this.logger,
-			name: "Interaction"
+			logger: this.logger
 		});
 	}
 	/**
 	* Warns for each command route with no registered `@SlashRoute` handler, which would fall through to
-	* UnhandledEvent at runtime. Warns rather than throws since a bot may route commands outside the registry.
+	* UnhandledEvent at runtime. A bot may route commands outside the registry, so this does not throw.
 	*
 	* @internal
 	*/
@@ -3655,12 +3683,9 @@ var InteractionDispatcher = class {
 	registerMiddleware(middlewareCtor, relativePath) {
 		const metadata = Reflect.getMetadata(MiddlewareMetadataKey, middlewareCtor);
 		if (metadata?.type !== "interaction") return;
-		const existingIndex = this.middlewares.findIndex((entry) => entry.ctor.name === middlewareCtor.name);
-		if (existingIndex !== -1) this.middlewares[existingIndex] = {
-			ctor: middlewareCtor,
-			priority: metadata.priority
-		};
-		else this.middlewares.push({
+		if (this.middlewares.some((entry) => entry.ctor === middlewareCtor)) return;
+		if (this.middlewares.some((entry) => entry.ctor.name === middlewareCtor.name)) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.InteractionDuplicateMiddleware, [middlewareCtor.name]);
+		this.middlewares.push({
 			ctor: middlewareCtor,
 			priority: metadata.priority
 		});
@@ -3676,12 +3701,22 @@ var InteractionDispatcher = class {
 		return obj.prototype instanceof InteractionMiddleware && Reflect.hasMetadata(MiddlewareMetadataKey, obj);
 	}
 	registerHandler(handlerClass, relativePath) {
+		const writes = [];
 		for (const [routeType, map] of this.routeTypes) {
 			const meta = Reflect.getMetadata(InteractionRouteKeys[routeType], handlerClass);
 			if (!areRoutes(meta)) continue;
-			meta.forEach((route) => map.set(route, handlerClass));
+			for (const route of meta) {
+				const existing = map.get(route);
+				if (existing && existing !== handlerClass) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.InteractionDuplicateRoute, [
+					route,
+					existing.name,
+					handlerClass.name
+				]);
+				writes.push([map, route]);
+			}
 			this.logger.utils.registration(handlerClass.name, (0, _seedcord_utils.formatFilePath)(relativePath));
 		}
+		for (const [map, route] of writes) map.set(route, handlerClass);
 	}
 	/** @internal For use in dev mode */
 	async onHmr(event) {
@@ -3932,9 +3967,11 @@ var HmrManager = class {
 	constructor() {}
 	/** @internal */
 	init() {
-		if ({}.hot && (envapt.Envapter.isDevelopment || envapt.Envapter.isTest)) {
+		if (!{}.hot) return;
+		setDevChannel((0, _seedcord_types_internal.wrapHot)({}.hot));
+		if (envapt.Envapter.isDevelopment || envapt.Envapter.isTest) {
 			this.logger.info("Enabled");
-			({}).hot.on("seedcord:hmr", (payload) => {
+			getDevChannel()?.on("seedcord:hmr", (payload) => {
 				const affected = payload.affectedModules?.length ?? 0;
 				this.logger.info(`${chalk.default.bold("1")} module changed, ${chalk.default.bold(affected)} affected modules`);
 				if (payload.affectedModules) this.logger.utils.list(payload.affectedModules.map((mod) => (0, _seedcord_utils.formatFilePath)(mod)), "Affected modules: ");
@@ -4131,8 +4168,8 @@ var UnhandledErrorContainer = class extends _seedcord_kit.BuilderComponent {
 *
 * Provides a centralized system for registering and executing custom subscribers
 * throughout the application lifecycle. Bus subscribers are loaded from configured directories
-* and can be triggered programmatically or by framework events. Accessed via `core.bus`, not
-* constructed directly.
+* and can be triggered programmatically or by framework events. Accessed via `core.bus`. Do not
+* construct it directly.
 */
 var Bus = class extends Plugin {
 	core;
@@ -4154,8 +4191,7 @@ var Bus = class extends Plugin {
 				registerHandler: this.registerSubscriber.bind(this),
 				unregisterHandler: this.unregisterSubscriber.bind(this),
 				getArtifacts: this.getArtifacts.bind(this),
-				logger: this.logger,
-				name: "Subscribers"
+				logger: this.logger
 			});
 		}
 	}
@@ -4213,7 +4249,6 @@ var Bus = class extends Plugin {
 			const index = handlers.findIndex((entry) => entry.ctor === handler);
 			if (index !== -1) handlers.splice(index, 1);
 		}
-		this.executedOnceHandlers.delete(handler);
 	}
 	isSubscriber(obj) {
 		if (typeof obj !== "function") return false;
@@ -4347,6 +4382,7 @@ var Seedcord = class Seedcord extends Pluggable {
 	registerHmrAwareModules() {
 		this.startup.addTask(_seedcord_services.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);
 			await Promise.resolve();
 		});
@@ -4356,7 +4392,7 @@ var Seedcord = class Seedcord extends Pluggable {
 //#endregion
 //#region src/index.ts
 /** Package version */
-const version = "0.15.0";
+const version = "0.16.0-next.0";
 
 //#endregion
 exports.ArraySource = ArraySource;