commandkit 0.1.11-dev.20250308130523 → 0.1.11-dev.20250308183646

package/dist/index.d.ts

@@ -1354,6 +1354,7 @@ interface LoadedSubCommand {
 }
 type CommandBuilderLike = SlashCommandBuilder | ContextMenuCommandBuilder | Record<string, any>;
 declare class AppCommandHandler {
+    #private;
     readonly commandkit: CommandKit;
     private loadedCommands;
     private loadedSubCommands;

package/dist/index.js

@@ -3291,7 +3291,7 @@ var init_CommandRegistrar = __esm({
 });
 
 // src/app/handlers/AppCommandHandler.ts
-var import_discord10, commandDataSchema, middlewareDataSchema, _AppCommandHandler, AppCommandHandler;
+var import_discord10, commandDataSchema, middlewareDataSchema, _AppCommandHandler_instances, finalizer_fn, _AppCommandHandler, AppCommandHandler;
 var init_AppCommandHandler = __esm({
   "src/app/handlers/AppCommandHandler.ts"() {
     "use strict";
@@ -3302,7 +3302,9 @@ var init_AppCommandHandler = __esm({
     init_MessageCommandParser();
     init_error_codes();
     init_CommandRegistrar();
+    init_async_context();
     init_Logger();
+    init_environment();
     commandDataSchema = {
       command: /* @__PURE__ */ __name((c) => c instanceof import_discord10.SlashCommandBuilder || c instanceof import_discord10.ContextMenuCommandBuilder || c && typeof c === "object", "command"),
       chatInput: /* @__PURE__ */ __name((c) => typeof c === "function", "chatInput"),
@@ -3318,18 +3320,19 @@ var init_AppCommandHandler = __esm({
     _AppCommandHandler = class _AppCommandHandler {
       constructor(commandkit) {
         this.commandkit = commandkit;
+        __privateAdd(this, _AppCommandHandler_instances);
+        __publicField(this, "loadedCommands", new import_discord10.Collection());
+        __publicField(this, "loadedSubCommands", new import_discord10.Collection());
+        __publicField(this, "loadedMiddlewares", new import_discord10.Collection());
+        // Name-to-ID mapping for easier lookup
+        __publicField(this, "commandNameToId", /* @__PURE__ */ new Map());
+        __publicField(this, "subcommandPathToId", /* @__PURE__ */ new Map());
+        __publicField(this, "registrar");
+        __publicField(this, "onInteraction", null);
+        __publicField(this, "onMessageCreate", null);
+        __publicField(this, "onMessageUpdate", null);
         this.registrar = new CommandRegistrar(this.commandkit);
       }
-      loadedCommands = new import_discord10.Collection();
-      loadedSubCommands = new import_discord10.Collection();
-      loadedMiddlewares = new import_discord10.Collection();
-      // Name-to-ID mapping for easier lookup
-      commandNameToId = /* @__PURE__ */ new Map();
-      subcommandPathToId = /* @__PURE__ */ new Map();
-      registrar;
-      onInteraction = null;
-      onMessageCreate = null;
-      onMessageUpdate = null;
       getCommandsArray() {
         return Array.from(this.loadedCommands.values());
       }
@@ -3411,7 +3414,13 @@ var init_AppCommandHandler = __esm({
         }
         const executionMode = this.getExecutionMode(source);
         let runCommand = null;
+        const env = new CommandKitEnvironment(this.commandkit);
+        env.setType("COMMAND_HANDLER" /* CommandHandler */);
+        env.variables.set("commandHandlerType", "app");
+        env.variables.set("currentCommandName", prepared.command.command.name);
+        env.variables.set("execHandlerKind", executionMode);
         const ctx = new MiddlewareContext(this.commandkit, {
+          environment: env,
           executionMode,
           interaction: !(source instanceof import_discord10.Message) ? source : null,
           message: source instanceof import_discord10.Message ? source : null,
@@ -3434,8 +3443,25 @@ var init_AppCommandHandler = __esm({
         }
         if (fn) {
           try {
-            const _executeCommand = /* @__PURE__ */ __name(async () => fn(ctx.clone()), "_executeCommand");
+            const _executeCommand = makeContextAwareFunction(
+              env,
+              async () => fn(ctx.clone()),
+              __privateMethod(this, _AppCommandHandler_instances, finalizer_fn).bind(this)
+            );
             const executeCommand = runCommand != null ? runCommand(_executeCommand) : _executeCommand;
+            afterCommand((env2) => {
+              const error = env2.getExecutionError();
+              const marker = env2.getMarker();
+              const time = `${env2.getExecutionTime().toFixed(2)}ms`;
+              if (error) {
+                Logger.error(
+                  `[${marker} - ${time}] Error executing command: ${error.stack || error}`
+                );
+                return;
+              }
+              Logger.info(`[${marker} - ${time}] Command executed successfully`);
+            });
+            env.markStart(prepared.command.command.name);
             const res = await this.commandkit.plugins.execute(
               async (ctx2, plugin) => {
                 return plugin.executeCommand(ctx2, source, prepared, executeCommand);
@@ -3448,8 +3474,12 @@ var init_AppCommandHandler = __esm({
             Logger.error(e);
           }
         }
-        for (const middleware of prepared.middlewares) {
-          await middleware.data.afterExecute(ctx);
+        try {
+          for (const middleware of prepared.middlewares) {
+            await middleware.data.afterExecute(ctx);
+          }
+        } finally {
+          env.markEnd();
         }
       }
       async prepareCommandRun(source) {
@@ -3499,7 +3529,7 @@ var init_AppCommandHandler = __esm({
             if (isErrorType(e, CommandKitErrorCodes.InvalidCommandPrefix)) {
               return null;
             }
-            console.error(e);
+            Logger.error(e);
             return null;
           }
         } else {
@@ -3792,6 +3822,12 @@ var init_AppCommandHandler = __esm({
         return command;
       }
     };
+    _AppCommandHandler_instances = new WeakSet();
+    finalizer_fn = /* @__PURE__ */ __name(async function() {
+      const env = useEnvironment();
+      await env.runDeferredFunctions();
+      env.clearAllDeferredFunctions();
+    }, "#finalizer");
     __name(_AppCommandHandler, "AppCommandHandler");
     AppCommandHandler = _AppCommandHandler;
   }
@@ -4617,6 +4653,7 @@ var init_CommandKit = __esm({
         }
         await this.loadPlugins();
         await __privateMethod(this, _CommandKit_instances, init_fn).call(this);
+        this.commandHandler.registerCommandHandler();
         this.incrementClientListenersCount();
         if (token !== false && !this.options.client.isReady()) {
           this.client.once(import_discord12.Events.ClientReady, async () => {
@@ -4625,6 +4662,8 @@ var init_CommandKit = __esm({
           await this.options.client.login(
             token ?? process.env.TOKEN ?? process.env.DISCORD_TOKEN
           );
+        } else if (this.options.client.isReady()) {
+          await this.commandHandler.registrar.register();
         }
         __privateSet(this, _started, true);
       }
@@ -4829,7 +4868,7 @@ var init_version = __esm({
     "use strict";
     init_cjs_shims();
     version = /* @__MACRO__ $version */
-    "0.1.11-dev.20250308130523";
+    "0.1.11-dev.20250308183646";
   }
 });