fix: context not throwing ckit errors

Author: notunderctrl

apps/test-bot/src/app/commands/(general)/+ping.middleware.ts

@@ -1,10 +1,14 @@
 import { Logger, type MiddlewareContext, stopMiddlewares } from 'commandkit';
 
 export function beforeExecute(ctx: MiddlewareContext) {
-  Logger.info(`Command-scoped middleware: ${ctx.commandName} will be stopped!`);
   Logger.info(
-    'None of the other beforeExecute middlewares are supposed to be executed',
+    `Command-scoped middleware: ${ctx.commandName} will be executed!`,
   );
+
+  // Logger.info(`Command-scoped middleware: ${ctx.commandName} will be stopped!`);
+  // Logger.info(
+  //   'None of the other beforeExecute middlewares are supposed to be executed',
+  // );
   // stopMiddlewares();
 }
 

apps/test-bot/src/app/commands/(general)/ping.ts

@@ -12,6 +12,7 @@ import {
   CommandMetadata,
   MessageCommandContext,
   stopMiddlewares,
+  Logger,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -66,6 +67,9 @@ export async function chatInput({
   interaction,
   client,
 }: ChatInputCommandContext) {
+  Logger.debug('calling stopMiddlewares');
+  stopMiddlewares();
+
   if (!interaction.channel) return;
 
   const button = new ButtonKit()
@@ -99,6 +103,4 @@ export async function chatInput({
       button.setDisabled(true);
       message.edit({ components: [row] });
     });
-
-  stopMiddlewares();
 }

packages/commandkit/src/app/commands/AppCommandRunner.ts

@@ -230,26 +230,19 @@ export class AppCommandRunner {
             Logger.debug(
               `Middleware propagation stopped for command "${middlewareCtx.commandName}". stopMiddlewares() was called by the command itself`,
             );
-          }
-
-          if (
-            !isErrorType(e, [
-              CommandKitErrorCodes.ForwardedCommand,
-              CommandKitErrorCodes.StopMiddlewares,
-            ])
-          ) {
+          } else if (!isErrorType(e, CommandKitErrorCodes.ForwardedCommand)) {
             if (shouldThrowOnError) {
               throw e;
             }
-
             Logger.error(e);
           }
         }
       }
     } else {
       result = {
         error: true,
-        message: 'Command execution was cancelled by the middleware.',
+        message:
+          'Command execution was cancelled by a beforeExecute middleware.',
       };
     }
 
@@ -258,7 +251,7 @@ export class AppCommandRunner {
     );
 
     // Run middleware after command execution only if `stopMiddlewares()` wasn't
-    // called in either `beforeExecute` middleware or in the command itself
+    // called in either `beforeExecute` middleware or in the command itself.
     if (
       !beforeMiddlewaresStopped &&
       !stopMiddlewaresCalledInCmd &&

packages/commandkit/src/context/async-context.ts

@@ -70,6 +70,9 @@ export function makeContextAwareFunction<
       } catch (e) {
         if (!isCommandKitError(e)) {
           env.setExecutionError(e as Error);
+        } else {
+          // rethrow commandkit errors so they can be handled by the caller
+          throw e;
         }
       } finally {
         if (typeof finalizer === 'function') {