@minesa-org/mini-interaction 0.2.5 → 0.2.6

package/dist/clients/MiniInteraction.js

@@ -101,10 +101,6 @@ export class MiniInteraction {
             this.trackInteractionState(interactionId, state.token, 'expired');
             return false;
         }
-        // Check if already responded
-        if (state.state === 'responded') {
-            return false;
-        }
         return true;
     }
     /**
@@ -1126,7 +1122,7 @@ export class MiniInteraction {
                 ackResolver = resolve;
             });
             // Helper to send follow-up responses via webhooks
-            const sendFollowUp = (token, data) => this.sendFollowUp(token, data);
+            const sendFollowUp = (token, data, messageId = '@original') => this.sendFollowUp(token, data, messageId);
             const interactionWithHelpers = createMessageComponentInteraction(interaction, {
                 onAck: (response) => ackResolver?.(response),
                 sendFollowUp,
@@ -1191,7 +1187,7 @@ export class MiniInteraction {
                 ackResolver = resolve;
             });
             // Helper to send follow-up responses via webhooks
-            const sendFollowUp = (token, data) => this.sendFollowUp(token, data);
+            const sendFollowUp = (token, data, messageId = '@original') => this.sendFollowUp(token, data, messageId);
             const interactionWithHelpers = createModalSubmitInteraction(interaction, {
                 onAck: (response) => ackResolver?.(response),
                 sendFollowUp,
@@ -1259,7 +1255,7 @@ export class MiniInteraction {
                 ackResolver = resolve;
             });
             // Helper to send follow-up responses via webhooks
-            const sendFollowUp = (token, data) => this.sendFollowUp(token, data);
+            const sendFollowUp = (token, data, messageId = '@original') => this.sendFollowUp(token, data, messageId);
             // Create a timeout wrapper for the command handler
             const timeoutWrapper = createTimeoutWrapper(async () => {
                 // Check if it's a chat input (slash) command
@@ -1351,15 +1347,18 @@ export class MiniInteraction {
      * Sends a follow-up response or edits an existing response via Discord's interaction webhooks.
      * This is used for interactions that have already been acknowledged (e.g., via deferReply).
      */
-    async sendFollowUp(token, response) {
-        const url = `${DISCORD_BASE_URL}/webhooks/${this.applicationId}/${token}/messages/@original`;
+    async sendFollowUp(token, response, messageId = "@original") {
+        const isEdit = messageId !== "";
+        const url = isEdit
+            ? `${DISCORD_BASE_URL}/webhooks/${this.applicationId}/${token}/messages/${messageId}`
+            : `${DISCORD_BASE_URL}/webhooks/${this.applicationId}/${token}`;
         // Only send follow-up if there is data to send
         if (!('data' in response) || !response.data) {
             return;
         }
         try {
             const fetchResponse = await this.fetchImpl(url, {
-                method: "PATCH",
+                method: isEdit ? "PATCH" : "POST",
                 headers: {
                     "Content-Type": "application/json",
                 },

package/dist/utils/CommandInteractionOptions.d.ts

@@ -144,9 +144,9 @@ export interface CommandInteraction extends Omit<APIChatInputApplicationCommandI
     options: CommandInteractionOptionResolver;
     getResponse(): APIInteractionResponse | null;
     reply(data: InteractionMessageData): APIInteractionResponseChannelMessageWithSource;
-    followUp(data: InteractionMessageData): APIInteractionResponseChannelMessageWithSource;
+    followUp(data: InteractionMessageData): Promise<APIInteractionResponseChannelMessageWithSource>;
     edit(data?: InteractionMessageData): APIInteractionResponseUpdateMessage;
-    editReply(data?: InteractionMessageData): APIInteractionResponseUpdateMessage;
+    editReply(data?: InteractionMessageData): Promise<APIInteractionResponseUpdateMessage>;
     deferReply(options?: DeferReplyOptions): APIInteractionResponseDeferredChannelMessageWithSource;
     showModal(data: APIModalInteractionResponseCallbackData | {
         toJSON(): APIModalInteractionResponseCallbackData;
@@ -155,7 +155,7 @@ export interface CommandInteraction extends Omit<APIChatInputApplicationCommandI
     canRespond?(interactionId: string): boolean;
     trackResponse?(interactionId: string, token: string, state: 'responded' | 'deferred'): void;
     onAck?(response: APIInteractionResponse): void;
-    sendFollowUp?(token: string, response: APIInteractionResponse): void;
+    sendFollowUp?(token: string, response: APIInteractionResponse, messageId?: string): Promise<void>;
 }
 export declare const CommandInteraction: {};
 /**
@@ -170,5 +170,5 @@ export declare function createCommandInteraction(interaction: APIChatInputApplic
     trackResponse?: (interactionId: string, token: string, state: 'responded' | 'deferred') => void;
     logTiming?: (interactionId: string, operation: string, startTime: number, success: boolean) => void;
     onAck?: (response: APIInteractionResponse) => void;
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
+    sendFollowUp?: (token: string, response: APIInteractionResponse, messageId?: string) => Promise<void>;
 }): CommandInteraction;

package/dist/utils/CommandInteractionOptions.js

@@ -327,6 +327,8 @@ export const CommandInteraction = {};
 export function createCommandInteraction(interaction, helpers) {
     const options = new CommandInteractionOptionResolver(interaction.data.options, interaction.data.resolved);
     let capturedResponse = null;
+    let isDeferred = false;
+    let hasResponded = false;
     /**
      * Stores the most recent response helper payload for later retrieval.
      */
@@ -382,32 +384,35 @@ export function createCommandInteraction(interaction, helpers) {
             const response = createMessageResponse(InteractionResponseType.ChannelMessageWithSource, data);
             // Track response
             this.trackResponse?.(this.id, this.token, 'responded');
+            hasResponded = true;
             // Notify acknowledgment
             this.onAck?.(response);
             return response;
         },
-        followUp(data) {
+        async followUp(data) {
             const response = createMessageResponse(InteractionResponseType.ChannelMessageWithSource, data);
             if (this.sendFollowUp) {
-                this.sendFollowUp(this.token, response);
+                // Empty string for messageId means a new follow-up (POST)
+                await this.sendFollowUp(this.token, response, '');
             }
             return response;
         },
         edit(data) {
             return createMessageResponse(InteractionResponseType.UpdateMessage, data);
         },
-        editReply(data) {
+        async editReply(data) {
             // Validate interaction can respond
             if (!this.canRespond?.(this.id)) {
-                throw new Error('Interaction cannot edit reply: already responded, expired, or not deferred');
+                throw new Error('Interaction cannot edit reply: expired');
             }
             const response = createMessageResponse(InteractionResponseType.UpdateMessage, data);
             // If it's already deferred or responded, we MUST use a webhook
-            if (this.sendFollowUp) {
-                this.sendFollowUp(this.token, response);
+            if (this.sendFollowUp && (isDeferred || hasResponded)) {
+                await this.sendFollowUp(this.token, response, '@original');
             }
             // Track response
             this.trackResponse?.(this.id, this.token, 'responded');
+            hasResponded = true;
             return response;
         },
         deferReply(options) {
@@ -420,6 +425,7 @@ export function createCommandInteraction(interaction, helpers) {
                 : undefined);
             // Track deferred state
             this.trackResponse?.(this.id, this.token, 'deferred');
+            isDeferred = true;
             // Notify acknowledgment
             this.onAck?.(response);
             return response;

package/dist/utils/MessageComponentInteraction.d.ts

@@ -18,69 +18,110 @@ export declare const ResolvedMentionableOption: {};
 /**
  * Base helper methods available on all component interactions.
  */
-type BaseComponentInteractionHelpers = {
-    getResponse: () => APIInteractionResponse | null;
-    reply: (data: InteractionMessageData) => APIInteractionResponseChannelMessageWithSource;
-    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
-    update: (data?: InteractionMessageData) => APIInteractionResponseUpdateMessage;
-    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
-    showModal: (data: APIModalInteractionResponseCallbackData | {
-        toJSON(): APIModalInteractionResponseCallbackData;
-    }) => APIModalInteractionResponse;
+export type BaseComponentInteractionHelpers = {
+    trackTiming?: (interactionId: string, operation: string, startTime: number, success: boolean) => void;
     onAck?: (response: APIInteractionResponse) => void;
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
+    sendFollowUp?: (token: string, response: APIInteractionResponse, messageId?: string) => Promise<void>;
 };
 /**
  * Button interaction with helper methods.
  * Buttons don't have values or resolved data.
  */
-export interface ButtonInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface ButtonInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageButtonInteractionData;
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const ButtonInteraction: {};
 /**
  * String select menu interaction with helper methods.
  */
-export interface StringSelectInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface StringSelectInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageStringSelectInteractionData;
     values: string[];
     getStringValues: () => string[];
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const StringSelectInteraction: {};
 /**
  * Role select menu interaction with helper methods.
  */
-export interface RoleSelectInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface RoleSelectInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageRoleSelectInteractionData;
     values: string[];
     getRoles: () => APIRole[];
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const RoleSelectInteraction: {};
 /**
  * User select menu interaction with helper methods.
  */
-export interface UserSelectInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface UserSelectInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageUserSelectInteractionData;
     values: string[];
     getUsers: () => ResolvedUserOption[];
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const UserSelectInteraction: {};
 /**
  * Channel select menu interaction with helper methods.
  */
-export interface ChannelSelectInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface ChannelSelectInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageChannelSelectInteractionData;
     values: string[];
     getChannels: () => APIInteractionDataResolvedChannel[];
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const ChannelSelectInteraction: {};
 /**
  * Mentionable select menu interaction with helper methods.
  */
-export interface MentionableSelectInteraction extends Omit<APIMessageComponentInteraction, "data">, BaseComponentInteractionHelpers {
+export interface MentionableSelectInteraction extends Omit<APIMessageComponentInteraction, "data"> {
     data: APIMessageMentionableSelectInteractionData;
     values: string[];
     getMentionables: () => ResolvedMentionableOption[];
+    getResponse: () => APIInteractionResponse | null;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
+    deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
+    deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
+    showModal: (data: APIModalInteractionResponseCallbackData | {
+        toJSON(): APIModalInteractionResponseCallbackData;
+    }) => APIModalInteractionResponse;
 }
 export declare const MentionableSelectInteraction: {};
 /**
@@ -91,9 +132,9 @@ export declare const MentionableSelectInteraction: {};
  */
 export type MessageComponentInteraction = APIMessageComponentInteraction & {
     getResponse: () => APIInteractionResponse | null;
-    reply: (data: InteractionMessageData) => APIInteractionResponseChannelMessageWithSource;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
     deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
-    update: (data?: InteractionMessageData) => APIInteractionResponseUpdateMessage;
+    update: (data?: InteractionMessageData) => Promise<APIInteractionResponseUpdateMessage>;
     deferUpdate: () => APIInteractionResponseDeferredMessageUpdate;
     showModal: (data: APIModalInteractionResponseCallbackData | {
         toJSON(): APIModalInteractionResponseCallbackData;
@@ -102,7 +143,7 @@ export type MessageComponentInteraction = APIMessageComponentInteraction & {
      * Finalise the interaction response via a webhook follow-up.
      * This is automatically called by reply() and update() if the interaction is deferred.
      */
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
+    sendFollowUp?: (token: string, response: APIInteractionResponse, messageId?: string) => Promise<void>;
     /**
      * The selected values from a select menu interaction.
      * This property is only present for select menu interactions.
@@ -140,10 +181,7 @@ export declare const MessageComponentInteraction: {};
  * Wraps a raw component interaction with helper methods mirroring Discord's expected responses.
  *
  * @param interaction - The raw interaction payload from Discord.
+ * @param helpers - Optional callback to capture the final interaction response.
  * @returns A helper-augmented interaction object.
  */
-export declare function createMessageComponentInteraction(interaction: APIMessageComponentInteraction, helpers?: {
-    onAck?: (response: APIInteractionResponse) => void;
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
-}): MessageComponentInteraction;
-export {};
+export declare function createMessageComponentInteraction(interaction: APIMessageComponentInteraction, helpers?: BaseComponentInteractionHelpers): MessageComponentInteraction;

package/dist/utils/MessageComponentInteraction.js

@@ -13,6 +13,7 @@ export const MessageComponentInteraction = {};
  * Wraps a raw component interaction with helper methods mirroring Discord's expected responses.
  *
  * @param interaction - The raw interaction payload from Discord.
+ * @param helpers - Optional callback to capture the final interaction response.
  * @returns A helper-augmented interaction object.
  */
 export function createMessageComponentInteraction(interaction, helpers) {
@@ -22,7 +23,7 @@ export function createMessageComponentInteraction(interaction, helpers) {
         capturedResponse = response;
         return response;
     };
-    const reply = (data) => {
+    const reply = async (data) => {
         const normalisedData = normaliseInteractionMessageData(data);
         if (!normalisedData) {
             throw new Error("[MiniInteraction] Component replies require response data to be provided.");
@@ -32,7 +33,7 @@ export function createMessageComponentInteraction(interaction, helpers) {
             data: normalisedData,
         });
         if (isDeferred && helpers?.sendFollowUp) {
-            helpers.sendFollowUp(interaction.token, response);
+            await helpers.sendFollowUp(interaction.token, response, '');
         }
         else {
             helpers?.onAck?.(response);
@@ -54,20 +55,23 @@ export function createMessageComponentInteraction(interaction, helpers) {
         helpers?.onAck?.(response);
         return response;
     };
-    const update = (data) => {
+    const update = async (data) => {
         const normalisedData = normaliseInteractionMessageData(data);
-        const response = normalisedData
+        const response = captureResponse(normalisedData
             ? {
                 type: InteractionResponseType.UpdateMessage,
                 data: normalisedData,
             }
             : {
                 type: InteractionResponseType.UpdateMessage,
-            };
+            });
         if (isDeferred && helpers?.sendFollowUp) {
-            helpers.sendFollowUp(interaction.token, response);
+            await helpers.sendFollowUp(interaction.token, response, '@original');
         }
-        return captureResponse(response);
+        else {
+            helpers?.onAck?.(response);
+        }
+        return response;
     };
     const deferUpdate = () => {
         const response = captureResponse({

package/dist/utils/ModalSubmitInteraction.d.ts

@@ -5,7 +5,7 @@ import { DeferReplyOptions, InteractionMessageData } from "./interactionMessageH
  */
 export type ModalSubmitInteraction = APIModalSubmitInteraction & {
     getResponse: () => APIInteractionResponse | null;
-    reply: (data: InteractionMessageData) => APIInteractionResponseChannelMessageWithSource;
+    reply: (data: InteractionMessageData) => Promise<APIInteractionResponseChannelMessageWithSource>;
     deferReply: (options?: DeferReplyOptions) => APIInteractionResponseDeferredChannelMessageWithSource;
     /**
      * Helper method to get the value of a text input component by its custom ID.
@@ -15,7 +15,7 @@ export type ModalSubmitInteraction = APIModalSubmitInteraction & {
      * Finalise the interaction response via a webhook follow-up.
      * This is automatically called by reply() if the interaction is deferred.
      */
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
+    sendFollowUp?: (token: string, response: APIInteractionResponse, messageId?: string) => Promise<void>;
 };
 export declare const ModalSubmitInteraction: {};
 /**
@@ -27,5 +27,5 @@ export declare const ModalSubmitInteraction: {};
  */
 export declare function createModalSubmitInteraction(interaction: APIModalSubmitInteraction, helpers?: {
     onAck?: (response: APIInteractionResponse) => void;
-    sendFollowUp?: (token: string, response: APIInteractionResponse) => void;
+    sendFollowUp?: (token: string, response: APIInteractionResponse, messageId?: string) => Promise<void>;
 }): ModalSubmitInteraction;

package/dist/utils/ModalSubmitInteraction.js

@@ -15,7 +15,7 @@ export function createModalSubmitInteraction(interaction, helpers) {
         capturedResponse = response;
         return response;
     };
-    const reply = (data) => {
+    const reply = async (data) => {
         const normalisedData = normaliseInteractionMessageData(data);
         if (!normalisedData) {
             throw new Error("[MiniInteraction] Modal replies require response data to be provided.");
@@ -25,7 +25,7 @@ export function createModalSubmitInteraction(interaction, helpers) {
             data: normalisedData,
         });
         if (isDeferred && helpers?.sendFollowUp) {
-            helpers.sendFollowUp(interaction.token, response);
+            await helpers.sendFollowUp(interaction.token, response, '');
         }
         else {
             helpers?.onAck?.(response);

package/dist/utils/interactionMessageHelpers.js

@@ -52,6 +52,13 @@ export function normaliseInteractionMessageData(data) {
     if (data.flags !== undefined) {
         responseData.flags = normaliseMessageFlags(data.flags);
     }
+    // Automatically handle IsComponentsV2 flag if Components V2 are detected
+    if (responseData.components && Array.isArray(responseData.components)) {
+        if (containsComponentsV2(responseData.components)) {
+            const currentFlags = responseData.flags ?? 0;
+            responseData.flags = (currentFlags | (0x1 << 12)); // 0x1 << 12 is IsComponentsV2
+        }
+    }
     return responseData;
 }
 function containsComponentsV2(components) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@minesa-org/mini-interaction",
-	"version": "0.2.5",
+	"version": "0.2.6",
 	"description": "Mini interaction, connecting your app with Discord via HTTP-interaction (Vercel support).",
 	"type": "module",
 	"main": "dist/index.js",