npm - seyfert - Versions diffs - 3.0.1-dev-14682613353.0 → 3.0.1-dev-14685617998.0 - Mend

seyfert 3.0.1-dev-14682613353.0 → 3.0.1-dev-14685617998.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/client/base.d.ts +4 -0
package/lib/commands/applications/chat.d.ts +2 -0
package/lib/commands/applications/entryPoint.d.ts +1 -0
package/lib/commands/applications/menu.d.ts +1 -0
package/lib/commands/handle.js +72 -76
package/lib/commands/handler.js +11 -0
package/lib/components/componentcommand.d.ts +1 -0
package/lib/components/handler.js +6 -5
package/lib/components/modalcommand.d.ts +1 -0
package/package.json +1 -1

package/lib/client/base.d.ts CHANGED Viewed

@@ -91,6 +91,8 @@ export interface BaseClientOptions {
     globalMiddlewares?: readonly (keyof RegisteredMiddlewares)[];
     commands?: {
         defaults?: {
+            onBeforeMiddlewares?: (context: CommandContext | MenuCommandContext<any, never>) => unknown;
+            onBeforeOptions?: Command['onBeforeOptions'];
             onRunError?: (context: MenuCommandContext<any, never> | CommandContext, error: unknown) => unknown;
             onPermissionsFail?: Command['onPermissionsFail'];
             onBotPermissionsFail?: (context: MenuCommandContext<any, never> | CommandContext, permissions: PermissionStrings) => unknown;
@@ -103,6 +105,7 @@ export interface BaseClientOptions {
     };
     components?: {
         defaults?: {
+            onBeforeMiddlewares?: ComponentCommand['onBeforeMiddlewares'];
             onRunError?: ComponentCommand['onRunError'];
             onInternalError?: ComponentCommand['onInternalError'];
             onMiddlewaresError?: ComponentCommand['onMiddlewaresError'];
@@ -111,6 +114,7 @@ export interface BaseClientOptions {
     };
     modals?: {
         defaults?: {
+            onBeforeMiddlewares?: ModalCommand['onBeforeMiddlewares'];
             onRunError?: ModalCommand['onRunError'];
             onInternalError?: ModalCommand['onInternalError'];
             onMiddlewaresError?: ModalCommand['onMiddlewaresError'];

package/lib/commands/applications/chat.d.ts CHANGED Viewed

@@ -89,6 +89,8 @@ export declare class BaseCommand {
         integration_types: BaseCommand["integrationTypes"];
     };
     reload(): Promise<void>;
+    onBeforeMiddlewares?(context: CommandContext): any;
+    onBeforeOptions?(context: CommandContext): any;
     run?(context: CommandContext): any;
     onAfterRun?(context: CommandContext, error: unknown | undefined): any;
     onRunError?(context: CommandContext, error: unknown): any;

package/lib/commands/applications/entryPoint.d.ts CHANGED Viewed

@@ -37,6 +37,7 @@ export declare abstract class EntryPointCommand {
         integration_types: ApplicationIntegrationType[];
     };
     reload(): Promise<void>;
+    onBeforeMiddlewares?(context: EntryPointContext): any;
     abstract run?(context: EntryPointContext): any;
     onAfterRun?(context: EntryPointContext, error: unknown | undefined): any;
     onRunError(context: EntryPointContext<never>, error: unknown): any;

package/lib/commands/applications/menu.d.ts CHANGED Viewed

@@ -37,6 +37,7 @@ export declare abstract class ContextMenuCommand {
         integration_types: ApplicationIntegrationType[];
     };
     reload(): Promise<void>;
+    onBeforeMiddlewares?(context: MenuCommandContext<any>): any;
     abstract run?(context: MenuCommandContext<any>): any;
     onAfterRun?(context: MenuCommandContext<any>, error: unknown | undefined): any;
     onRunError?(context: MenuCommandContext<any, never>, error: unknown): any;

package/lib/commands/handle.js CHANGED Viewed

@@ -33,22 +33,23 @@ class HandleCommand {
             }
         }
         catch (error) {
-            // pass
+            this.client.logger.error(`[${optionsResolver.fullCommandName}] Internal error:`, error);
         }
     }
     async contextMenu(command, interaction, context) {
-        if (context.guildId && command.botPermissions) {
-            const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
-            if (permissions)
-                return command.onBotPermissionsFail?.(context, permissions);
-        }
-        const resultGlobal = await this.runGlobalMiddlewares(command, context);
-        if (typeof resultGlobal === 'boolean')
-            return;
-        const resultMiddle = await this.runMiddlewares(command, context);
-        if (typeof resultMiddle === 'boolean')
-            return;
         try {
+            if (context.guildId && command.botPermissions) {
+                const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
+                if (permissions)
+                    return await command.onBotPermissionsFail?.(context, permissions);
+            }
+            await command.onBeforeMiddlewares?.(context);
+            const resultGlobal = await this.runGlobalMiddlewares(command, context);
+            if (typeof resultGlobal === 'boolean')
+                return;
+            const resultMiddle = await this.runMiddlewares(command, context);
+            if (typeof resultMiddle === 'boolean')
+                return;
             try {
                 await command.run(context);
                 await command.onAfterRun?.(context, undefined);
@@ -62,8 +63,8 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, error);
             }
-            catch {
-                // pass
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
     }
@@ -74,18 +75,19 @@ class HandleCommand {
         return this.contextMenu(command, interaction, context);
     }
     async entryPoint(command, interaction, context) {
-        if (context.guildId && command.botPermissions) {
-            const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
-            if (permissions)
-                return command.onBotPermissionsFail(context, permissions);
-        }
-        const resultGlobal = await this.runGlobalMiddlewares(command, context);
-        if (typeof resultGlobal === 'boolean')
-            return;
-        const resultMiddle = await this.runMiddlewares(command, context);
-        if (typeof resultMiddle === 'boolean')
-            return;
         try {
+            if (context.guildId && command.botPermissions) {
+                const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
+                if (permissions)
+                    return await command.onBotPermissionsFail(context, permissions);
+            }
+            await command.onBeforeMiddlewares?.(context);
+            const resultGlobal = await this.runGlobalMiddlewares(command, context);
+            if (typeof resultGlobal === 'boolean')
+                return;
+            const resultMiddle = await this.runMiddlewares(command, context);
+            if (typeof resultMiddle === 'boolean')
+                return;
             try {
                 await command.run(context);
                 await command.onAfterRun?.(context, undefined);
@@ -99,33 +101,35 @@ class HandleCommand {
             try {
                 await command.onInternalError(this.client, command, error);
             }
-            catch {
-                // pass
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
     }
     async chatInput(command, interaction, resolver, context) {
-        if (context.guildId) {
-            if (command.botPermissions) {
-                const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
-                if (permissions)
-                    return command.onBotPermissionsFail?.(context, permissions);
-            }
-            if (command.defaultMemberPermissions) {
-                const permissions = this.checkPermissions(interaction.member.permissions, command.defaultMemberPermissions);
-                if (permissions)
-                    return command.onPermissionsFail?.(context, permissions);
-            }
-        }
-        if (!(await this.runOptions(command, context, resolver)))
-            return;
-        const resultGlobal = await this.runGlobalMiddlewares(command, context);
-        if (typeof resultGlobal === 'boolean')
-            return;
-        const resultMiddle = await this.runMiddlewares(command, context);
-        if (typeof resultMiddle === 'boolean')
-            return;
         try {
+            if (context.guildId) {
+                if (command.botPermissions) {
+                    const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
+                    if (permissions)
+                        return await command.onBotPermissionsFail?.(context, permissions);
+                }
+                if (command.defaultMemberPermissions) {
+                    const permissions = this.checkPermissions(interaction.member.permissions, command.defaultMemberPermissions);
+                    if (permissions)
+                        return await command.onPermissionsFail?.(context, permissions);
+                }
+            }
+            await command.onBeforeOptions?.(context);
+            if (!(await this.runOptions(command, context, resolver)))
+                return;
+            await command.onBeforeMiddlewares?.(context);
+            const resultGlobal = await this.runGlobalMiddlewares(command, context);
+            if (typeof resultGlobal === 'boolean')
+                return;
+            const resultMiddle = await this.runMiddlewares(command, context);
+            if (typeof resultMiddle === 'boolean')
+                return;
             try {
                 await command.run(context);
                 await command.onAfterRun?.(context, undefined);
@@ -139,8 +143,8 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, error);
             }
-            catch {
-                // pass
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
     }
@@ -261,16 +265,16 @@ class HandleCommand {
             members: {},
             attachments: {},
         };
-        const args = this.argsParser(argsContent, command, message);
-        const { options, errors } = await this.argsOptionsParser(command, rawMessage, args, resolved);
-        const optionsResolver = this.makeResolver(self, options, parent, rawMessage.guild_id, resolved);
-        const context = new _1.CommandContext(self, message, optionsResolver, shardId, command);
-        //@ts-expect-error
-        const extendContext = self.options?.context?.(message) ?? {};
-        Object.assign(context, extendContext);
         try {
+            const args = this.argsParser(argsContent, command, message);
+            const { options, errors } = await this.argsOptionsParser(command, rawMessage, args, resolved);
+            const optionsResolver = this.makeResolver(self, options, parent, rawMessage.guild_id, resolved);
+            const context = new _1.CommandContext(self, message, optionsResolver, shardId, command);
+            //@ts-expect-error
+            const extendContext = self.options?.context?.(message) ?? {};
+            Object.assign(context, extendContext);
             if (errors.length) {
-                return command.onOptionsError?.(context, Object.fromEntries(errors.map(x => {
+                return await command.onOptionsError?.(context, Object.fromEntries(errors.map(x => {
                     return [
                         x.name,
                         {
@@ -287,19 +291,21 @@ class HandleCommand {
                     const permissions = this.checkPermissions(memberPermissions, command.defaultMemberPermissions);
                     const guild = await this.client.guilds.raw(rawMessage.guild_id);
                     if (permissions && guild.owner_id !== rawMessage.author.id) {
-                        return command.onPermissionsFail?.(context, memberPermissions.keys(permissions));
+                        return await command.onPermissionsFail?.(context, memberPermissions.keys(permissions));
                     }
                 }
                 if (command.botPermissions) {
                     const appPermissions = await self.members.permissions(rawMessage.guild_id, self.botId);
                     const permissions = this.checkPermissions(appPermissions, command.botPermissions);
                     if (permissions) {
-                        return command.onBotPermissionsFail?.(context, permissions);
+                        return await command.onBotPermissionsFail?.(context, permissions);
                     }
                 }
             }
+            await command.onBeforeOptions?.(context);
             if (!(await this.runOptions(command, context, optionsResolver)))
                 return;
+            await command.onBeforeMiddlewares?.(context);
             const resultGlobal = await this.runGlobalMiddlewares(command, context);
             if (typeof resultGlobal === 'boolean')
                 return;
@@ -319,8 +325,8 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, error);
             }
-            catch {
-                // http 418
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
     }
@@ -445,8 +451,8 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, e);
             }
-            catch {
-                // http 418
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
         return false;
@@ -467,8 +473,8 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, e);
             }
-            catch {
-                // http 418
+            catch (err) {
+                this.client.logger.error(`[${command.name}] Internal error:`, err);
             }
         }
         return false;
@@ -487,17 +493,7 @@ class HandleCommand {
     async runOptions(command, context, resolver) {
         const [erroredOptions, result] = await command.__runOptions(context, resolver);
         if (erroredOptions) {
-            try {
-                await command.onOptionsError?.(context, result);
-            }
-            catch (e) {
-                try {
-                    await command.onInternalError?.(this.client, command, e);
-                }
-                catch {
-                    // http 418
-                }
-            }
+            await command.onOptionsError?.(context, result);
             return false;
         }
         return true;

package/lib/commands/handler.js CHANGED Viewed

@@ -448,6 +448,7 @@ class CommandHandler extends common_1.BaseHandler {
     stablishContextCommandDefaults(commandInstance) {
         if (!(commandInstance instanceof menu_1.ContextMenuCommand))
             return false;
+        commandInstance.onBeforeMiddlewares ??= this.client.options.commands?.defaults?.onBeforeMiddlewares;
         commandInstance.onAfterRun ??= this.client.options.commands?.defaults?.onAfterRun;
         commandInstance.onBotPermissionsFail ??= this.client.options.commands?.defaults?.onBotPermissionsFail;
         commandInstance.onInternalError ??= this.client.options.commands?.defaults?.onInternalError;
@@ -458,6 +459,8 @@ class CommandHandler extends common_1.BaseHandler {
     stablishCommandDefaults(commandInstance) {
         if (!(commandInstance instanceof chat_1.Command))
             return false;
+        commandInstance.onBeforeMiddlewares ??= this.client.options.commands?.defaults?.onBeforeMiddlewares;
+        commandInstance.onBeforeOptions ??= this.client.options.commands?.defaults?.onBeforeOptions;
         commandInstance.onAfterRun ??= this.client.options.commands?.defaults?.onAfterRun;
         commandInstance.onBotPermissionsFail ??= this.client.options.commands?.defaults?.onBotPermissionsFail;
         commandInstance.onInternalError ??= this.client.options.commands?.defaults?.onInternalError;
@@ -470,6 +473,14 @@ class CommandHandler extends common_1.BaseHandler {
     }
     stablishSubCommandDefaults(commandInstance, option) {
         option.middlewares = (commandInstance.middlewares ?? []).concat(option.middlewares ?? []);
+        option.onBeforeMiddlewares =
+            option.onBeforeMiddlewares?.bind(option) ??
+                commandInstance.onBeforeMiddlewares?.bind(commandInstance) ??
+                this.client.options.commands?.defaults?.onBeforeMiddlewares;
+        option.onBeforeOptions =
+            option.onBeforeOptions?.bind(option) ??
+                commandInstance.onBeforeOptions?.bind(commandInstance) ??
+                this.client.options.commands?.defaults?.onBeforeOptions;
         option.onMiddlewaresError =
             option.onMiddlewaresError?.bind(option) ??
                 commandInstance.onMiddlewaresError?.bind(commandInstance) ??

package/lib/components/componentcommand.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ export declare abstract class ComponentCommand {
     middlewares: (keyof RegisteredMiddlewares)[];
     props: ExtraProps;
     get cType(): number;
+    onBeforeMiddlewares?(context: ComponentContext): any;
     onAfterRun?(context: ComponentContext, error: unknown | undefined): any;
     onRunError?(context: ComponentContext, error: unknown): any;
     onMiddlewaresError?(context: ComponentContext, error: string): any;

package/lib/components/handler.js CHANGED Viewed

@@ -152,6 +152,7 @@ class ComponentHandler extends common_1.BaseHandler {
         component.onMiddlewaresError ??= this.client.options?.[is]?.defaults?.onMiddlewaresError;
         component.onRunError ??= this.client.options?.[is]?.defaults?.onRunError;
         component.onAfterRun ??= this.client.options?.[is]?.defaults?.onAfterRun;
+        component.onBeforeMiddlewares ??= this.client.options?.[is]?.defaults?.onBeforeMiddlewares;
     }
     set(instances) {
         for (const i of instances) {
@@ -237,19 +238,20 @@ class ComponentHandler extends common_1.BaseHandler {
     }
     async execute(i, context) {
         try {
+            await i.onBeforeMiddlewares?.(context);
             const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (context.client.options?.globalMiddlewares ?? []), true);
             if (resultRunGlobalMiddlewares.pass) {
                 return;
             }
             if ('error' in resultRunGlobalMiddlewares) {
-                return i.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
+                return await i.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
             }
             const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, i.middlewares, false);
             if (resultRunMiddlewares.pass) {
                 return;
             }
             if ('error' in resultRunMiddlewares) {
-                return i.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
+                return await i.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
             }
             try {
                 await i.run(context);
@@ -264,9 +266,8 @@ class ComponentHandler extends common_1.BaseHandler {
             try {
                 await i.onInternalError?.(this.client, error);
             }
-            catch (e) {
-                // supress error
-                this.logger.error(e);
+            catch (err) {
+                this.client.logger.error(`[${i.customId ?? 'Component/Modal command'}] Internal error:`, err);
             }
         }
     }

package/lib/components/modalcommand.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare abstract class ModalCommand {
     abstract run(context: ModalContext): any;
     middlewares: (keyof RegisteredMiddlewares)[];
     props: ExtraProps;
+    onBeforeMiddlewares?(context: ModalContext): any;
     onAfterRun?(context: ModalContext, error: unknown | undefined): any;
     onRunError?(context: ModalContext, error: unknown): any;
     onMiddlewaresError?(context: ModalContext, error: string): any;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "3.0.1-dev-14682613353.0",
+	"version": "3.0.1-dev-14685617998.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",