argus-discord-analytics 0.2.0 → 0.2.2

package/dist/index.d.mts

@@ -21,7 +21,7 @@
  * argus.trackRevenue({ source: 'patreon', amount: 500, tier: 'Premium' });
  * ```
  */
-declare const SDK_VERSION = "0.2.0";
+declare const SDK_VERSION = "0.2.2";
 interface ArgusConfig {
     /** Your Argus API key (starts with arg_live_ or arg_test_) */
     apiKey: string;
@@ -37,6 +37,12 @@ interface ArgusConfig {
     hashUserIds?: boolean;
     /** Heartbeat interval in ms (default: 30000) */
     heartbeatInterval?: number;
+    /**
+     * Discord Application ID to filter events.
+     * If set on both SDK and dashboard, only matching events are accepted.
+     * Use `client.user?.id` to get this from your Discord.js bot.
+     */
+    discordBotId?: string;
 }
 interface TrackEvent {
     type: 'command' | 'error' | 'custom';
@@ -81,6 +87,7 @@ declare class Argus {
     private flushInterval;
     private hashUserIds;
     private heartbeatInterval;
+    private discordBotId;
     private queue;
     private serverQueue;
     private revenueQueue;
@@ -94,17 +101,32 @@ declare class Argus {
     private startFlushTimer;
     /**
      * Track a Discord.js interaction automatically
-     * Extracts command name (including subcommands), server ID, and user ID from the interaction
+     * Auto-detects interaction type and routes to appropriate tracking method:
+     * - Commands → trackCommand (with subcommand extraction)
+     * - Buttons → trackButton
+     * - Select menus → trackSelectMenu
+     *
+     * @example
+     * ```typescript
+     * // One line for everything!
+     * client.on('interactionCreate', (interaction) => {
+     *   argus.track(interaction);
+     * });
+     * ```
      */
     track(interaction: {
         commandName?: string;
         customId?: string;
+        values?: string[];
         guildId?: string | null;
         user?: {
             id: string;
         };
         type?: number;
         options?: unknown;
+        message?: {
+            id: string;
+        };
     }): void;
     /**
      * Track a custom event
@@ -131,7 +153,15 @@ declare class Argus {
      * });
      * ```
      */
-    trackCommand(commandOrInteraction: string | Record<string, unknown>, options?: {
+    trackCommand(commandOrInteraction: string | {
+        commandName?: string;
+        customId?: string;
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+        options?: unknown;
+    }, options?: {
         serverId?: string;
         userId?: string;
         metadata?: Record<string, unknown>;
@@ -145,6 +175,51 @@ declare class Argus {
         userId?: string;
         metadata?: Record<string, unknown>;
     }): void;
+    /**
+     * Track a button click interaction
+     *
+     * @example
+     * ```typescript
+     * client.on('interactionCreate', (interaction) => {
+     *   if (interaction.isButton()) {
+     *     argus.trackButton(interaction);
+     *     // Tracked as: "button:buy_premium"
+     *   }
+     * });
+     * ```
+     */
+    trackButton(interaction: {
+        customId: string;
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+        message?: {
+            id: string;
+        };
+    }): void;
+    /**
+     * Track a select menu interaction
+     *
+     * @example
+     * ```typescript
+     * client.on('interactionCreate', (interaction) => {
+     *   if (interaction.isStringSelectMenu()) {
+     *     argus.trackSelectMenu(interaction);
+     *     // Tracked as: "select:role_picker"
+     *     // Metadata includes: selectedValues
+     *   }
+     * });
+     * ```
+     */
+    trackSelectMenu(interaction: {
+        customId: string;
+        values: string[];
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+    }): void;
     /**
      * Track server join or leave events
      *

package/dist/index.d.ts

@@ -21,7 +21,7 @@
  * argus.trackRevenue({ source: 'patreon', amount: 500, tier: 'Premium' });
  * ```
  */
-declare const SDK_VERSION = "0.2.0";
+declare const SDK_VERSION = "0.2.2";
 interface ArgusConfig {
     /** Your Argus API key (starts with arg_live_ or arg_test_) */
     apiKey: string;
@@ -37,6 +37,12 @@ interface ArgusConfig {
     hashUserIds?: boolean;
     /** Heartbeat interval in ms (default: 30000) */
     heartbeatInterval?: number;
+    /**
+     * Discord Application ID to filter events.
+     * If set on both SDK and dashboard, only matching events are accepted.
+     * Use `client.user?.id` to get this from your Discord.js bot.
+     */
+    discordBotId?: string;
 }
 interface TrackEvent {
     type: 'command' | 'error' | 'custom';
@@ -81,6 +87,7 @@ declare class Argus {
     private flushInterval;
     private hashUserIds;
     private heartbeatInterval;
+    private discordBotId;
     private queue;
     private serverQueue;
     private revenueQueue;
@@ -94,17 +101,32 @@ declare class Argus {
     private startFlushTimer;
     /**
      * Track a Discord.js interaction automatically
-     * Extracts command name (including subcommands), server ID, and user ID from the interaction
+     * Auto-detects interaction type and routes to appropriate tracking method:
+     * - Commands → trackCommand (with subcommand extraction)
+     * - Buttons → trackButton
+     * - Select menus → trackSelectMenu
+     *
+     * @example
+     * ```typescript
+     * // One line for everything!
+     * client.on('interactionCreate', (interaction) => {
+     *   argus.track(interaction);
+     * });
+     * ```
      */
     track(interaction: {
         commandName?: string;
         customId?: string;
+        values?: string[];
         guildId?: string | null;
         user?: {
             id: string;
         };
         type?: number;
         options?: unknown;
+        message?: {
+            id: string;
+        };
     }): void;
     /**
      * Track a custom event
@@ -131,7 +153,15 @@ declare class Argus {
      * });
      * ```
      */
-    trackCommand(commandOrInteraction: string | Record<string, unknown>, options?: {
+    trackCommand(commandOrInteraction: string | {
+        commandName?: string;
+        customId?: string;
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+        options?: unknown;
+    }, options?: {
         serverId?: string;
         userId?: string;
         metadata?: Record<string, unknown>;
@@ -145,6 +175,51 @@ declare class Argus {
         userId?: string;
         metadata?: Record<string, unknown>;
     }): void;
+    /**
+     * Track a button click interaction
+     *
+     * @example
+     * ```typescript
+     * client.on('interactionCreate', (interaction) => {
+     *   if (interaction.isButton()) {
+     *     argus.trackButton(interaction);
+     *     // Tracked as: "button:buy_premium"
+     *   }
+     * });
+     * ```
+     */
+    trackButton(interaction: {
+        customId: string;
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+        message?: {
+            id: string;
+        };
+    }): void;
+    /**
+     * Track a select menu interaction
+     *
+     * @example
+     * ```typescript
+     * client.on('interactionCreate', (interaction) => {
+     *   if (interaction.isStringSelectMenu()) {
+     *     argus.trackSelectMenu(interaction);
+     *     // Tracked as: "select:role_picker"
+     *     // Metadata includes: selectedValues
+     *   }
+     * });
+     * ```
+     */
+    trackSelectMenu(interaction: {
+        customId: string;
+        values: string[];
+        guildId?: string | null;
+        user?: {
+            id: string;
+        };
+    }): void;
     /**
      * Track server join or leave events
      *

package/dist/index.js

@@ -25,7 +25,7 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
-var SDK_VERSION = "0.2.0";
+var SDK_VERSION = "0.2.2";
 function hashString(str) {
   let hash = 0;
   for (let i = 0; i < str.length; i++) {
@@ -37,21 +37,50 @@ function hashString(str) {
 }
 function extractFullCommandName(interaction) {
   let command = interaction.commandName || interaction.customId || "unknown";
+  let foundSubcommand = false;
   const options = interaction.options;
   if (options && typeof options.getSubcommandGroup === "function") {
     try {
       const group = options.getSubcommandGroup(false);
-      if (group) command += ` ${group}`;
+      if (group) {
+        command += ` ${group}`;
+        foundSubcommand = true;
+      }
     } catch {
     }
   }
   if (options && typeof options.getSubcommand === "function") {
     try {
       const sub = options.getSubcommand(false);
-      if (sub) command += ` ${sub}`;
+      if (sub) {
+        command += ` ${sub}`;
+        foundSubcommand = true;
+      }
     } catch {
     }
   }
+  if (!foundSubcommand && options) {
+    const optionsData = options.data;
+    if (Array.isArray(optionsData)) {
+      for (const opt of optionsData) {
+        if (opt.type === 2) {
+          command += ` ${opt.name}`;
+          if (Array.isArray(opt.options)) {
+            for (const subOpt of opt.options) {
+              if (subOpt.type === 1) {
+                command += ` ${subOpt.name}`;
+                break;
+              }
+            }
+          }
+          break;
+        } else if (opt.type === 1) {
+          command += ` ${opt.name}`;
+          break;
+        }
+      }
+    }
+  }
   return command;
 }
 var Argus = class {
@@ -78,8 +107,9 @@ var Argus = class {
     this.flushInterval = config.flushInterval || 1e4;
     this.hashUserIds = config.hashUserIds !== false;
     this.heartbeatInterval = config.heartbeatInterval || 3e4;
+    this.discordBotId = config.discordBotId;
     this.startFlushTimer();
-    this.log("Argus initialized");
+    this.log("Argus initialized", this.discordBotId ? `(Discord Bot ID: ${this.discordBotId})` : "");
   }
   log(...args) {
     if (this.debug) {
@@ -94,9 +124,36 @@ var Argus = class {
   }
   /**
    * Track a Discord.js interaction automatically
-   * Extracts command name (including subcommands), server ID, and user ID from the interaction
+   * Auto-detects interaction type and routes to appropriate tracking method:
+   * - Commands → trackCommand (with subcommand extraction)
+   * - Buttons → trackButton
+   * - Select menus → trackSelectMenu
+   * 
+   * @example
+   * ```typescript
+   * // One line for everything!
+   * client.on('interactionCreate', (interaction) => {
+   *   argus.track(interaction);
+   * });
+   * ```
    */
   track(interaction) {
+    if (interaction.customId && !interaction.commandName) {
+      if (Array.isArray(interaction.values)) {
+        return this.trackSelectMenu({
+          customId: interaction.customId,
+          values: interaction.values,
+          guildId: interaction.guildId,
+          user: interaction.user
+        });
+      }
+      return this.trackButton({
+        customId: interaction.customId,
+        guildId: interaction.guildId,
+        user: interaction.user,
+        message: interaction.message
+      });
+    }
     const name = extractFullCommandName(interaction);
     const serverId = interaction.guildId || void 0;
     const userId = interaction.user?.id;
@@ -155,10 +212,9 @@ var Argus = class {
     } else {
       commandName = extractFullCommandName(commandOrInteraction);
       if (!extractedOptions) {
-        const interaction = commandOrInteraction;
         extractedOptions = {
-          serverId: interaction.guildId || void 0,
-          userId: interaction.user?.id
+          serverId: commandOrInteraction.guildId || void 0,
+          userId: commandOrInteraction.user?.id
         };
       }
     }
@@ -180,6 +236,56 @@ var Argus = class {
       }
     });
   }
+  /**
+   * Track a button click interaction
+   * 
+   * @example
+   * ```typescript
+   * client.on('interactionCreate', (interaction) => {
+   *   if (interaction.isButton()) {
+   *     argus.trackButton(interaction);
+   *     // Tracked as: "button:buy_premium"
+   *   }
+   * });
+   * ```
+   */
+  trackButton(interaction) {
+    this.trackEvent("custom", `button:${interaction.customId}`, {
+      serverId: interaction.guildId || void 0,
+      userId: interaction.user?.id,
+      metadata: {
+        interactionType: "button",
+        customId: interaction.customId,
+        messageId: interaction.message?.id
+      }
+    });
+  }
+  /**
+   * Track a select menu interaction
+   * 
+   * @example
+   * ```typescript
+   * client.on('interactionCreate', (interaction) => {
+   *   if (interaction.isStringSelectMenu()) {
+   *     argus.trackSelectMenu(interaction);
+   *     // Tracked as: "select:role_picker"
+   *     // Metadata includes: selectedValues
+   *   }
+   * });
+   * ```
+   */
+  trackSelectMenu(interaction) {
+    this.trackEvent("custom", `select:${interaction.customId}`, {
+      serverId: interaction.guildId || void 0,
+      userId: interaction.user?.id,
+      metadata: {
+        interactionType: "select_menu",
+        customId: interaction.customId,
+        selectedValues: interaction.values,
+        selectionCount: interaction.values.length
+      }
+    });
+  }
   /**
    * Track server join or leave events
    * 
@@ -274,7 +380,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events, sdkVersion: SDK_VERSION })
+        body: JSON.stringify({ events, sdkVersion: SDK_VERSION, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -299,7 +405,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events })
+        body: JSON.stringify({ events, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -324,7 +430,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events })
+        body: JSON.stringify({ events, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);

package/dist/index.mjs

@@ -1,5 +1,5 @@
 // src/index.ts
-var SDK_VERSION = "0.2.0";
+var SDK_VERSION = "0.2.2";
 function hashString(str) {
   let hash = 0;
   for (let i = 0; i < str.length; i++) {
@@ -11,21 +11,50 @@ function hashString(str) {
 }
 function extractFullCommandName(interaction) {
   let command = interaction.commandName || interaction.customId || "unknown";
+  let foundSubcommand = false;
   const options = interaction.options;
   if (options && typeof options.getSubcommandGroup === "function") {
     try {
       const group = options.getSubcommandGroup(false);
-      if (group) command += ` ${group}`;
+      if (group) {
+        command += ` ${group}`;
+        foundSubcommand = true;
+      }
     } catch {
     }
   }
   if (options && typeof options.getSubcommand === "function") {
     try {
       const sub = options.getSubcommand(false);
-      if (sub) command += ` ${sub}`;
+      if (sub) {
+        command += ` ${sub}`;
+        foundSubcommand = true;
+      }
     } catch {
     }
   }
+  if (!foundSubcommand && options) {
+    const optionsData = options.data;
+    if (Array.isArray(optionsData)) {
+      for (const opt of optionsData) {
+        if (opt.type === 2) {
+          command += ` ${opt.name}`;
+          if (Array.isArray(opt.options)) {
+            for (const subOpt of opt.options) {
+              if (subOpt.type === 1) {
+                command += ` ${subOpt.name}`;
+                break;
+              }
+            }
+          }
+          break;
+        } else if (opt.type === 1) {
+          command += ` ${opt.name}`;
+          break;
+        }
+      }
+    }
+  }
   return command;
 }
 var Argus = class {
@@ -52,8 +81,9 @@ var Argus = class {
     this.flushInterval = config.flushInterval || 1e4;
     this.hashUserIds = config.hashUserIds !== false;
     this.heartbeatInterval = config.heartbeatInterval || 3e4;
+    this.discordBotId = config.discordBotId;
     this.startFlushTimer();
-    this.log("Argus initialized");
+    this.log("Argus initialized", this.discordBotId ? `(Discord Bot ID: ${this.discordBotId})` : "");
   }
   log(...args) {
     if (this.debug) {
@@ -68,9 +98,36 @@ var Argus = class {
   }
   /**
    * Track a Discord.js interaction automatically
-   * Extracts command name (including subcommands), server ID, and user ID from the interaction
+   * Auto-detects interaction type and routes to appropriate tracking method:
+   * - Commands → trackCommand (with subcommand extraction)
+   * - Buttons → trackButton
+   * - Select menus → trackSelectMenu
+   * 
+   * @example
+   * ```typescript
+   * // One line for everything!
+   * client.on('interactionCreate', (interaction) => {
+   *   argus.track(interaction);
+   * });
+   * ```
    */
   track(interaction) {
+    if (interaction.customId && !interaction.commandName) {
+      if (Array.isArray(interaction.values)) {
+        return this.trackSelectMenu({
+          customId: interaction.customId,
+          values: interaction.values,
+          guildId: interaction.guildId,
+          user: interaction.user
+        });
+      }
+      return this.trackButton({
+        customId: interaction.customId,
+        guildId: interaction.guildId,
+        user: interaction.user,
+        message: interaction.message
+      });
+    }
     const name = extractFullCommandName(interaction);
     const serverId = interaction.guildId || void 0;
     const userId = interaction.user?.id;
@@ -129,10 +186,9 @@ var Argus = class {
     } else {
       commandName = extractFullCommandName(commandOrInteraction);
       if (!extractedOptions) {
-        const interaction = commandOrInteraction;
         extractedOptions = {
-          serverId: interaction.guildId || void 0,
-          userId: interaction.user?.id
+          serverId: commandOrInteraction.guildId || void 0,
+          userId: commandOrInteraction.user?.id
         };
       }
     }
@@ -154,6 +210,56 @@ var Argus = class {
       }
     });
   }
+  /**
+   * Track a button click interaction
+   * 
+   * @example
+   * ```typescript
+   * client.on('interactionCreate', (interaction) => {
+   *   if (interaction.isButton()) {
+   *     argus.trackButton(interaction);
+   *     // Tracked as: "button:buy_premium"
+   *   }
+   * });
+   * ```
+   */
+  trackButton(interaction) {
+    this.trackEvent("custom", `button:${interaction.customId}`, {
+      serverId: interaction.guildId || void 0,
+      userId: interaction.user?.id,
+      metadata: {
+        interactionType: "button",
+        customId: interaction.customId,
+        messageId: interaction.message?.id
+      }
+    });
+  }
+  /**
+   * Track a select menu interaction
+   * 
+   * @example
+   * ```typescript
+   * client.on('interactionCreate', (interaction) => {
+   *   if (interaction.isStringSelectMenu()) {
+   *     argus.trackSelectMenu(interaction);
+   *     // Tracked as: "select:role_picker"
+   *     // Metadata includes: selectedValues
+   *   }
+   * });
+   * ```
+   */
+  trackSelectMenu(interaction) {
+    this.trackEvent("custom", `select:${interaction.customId}`, {
+      serverId: interaction.guildId || void 0,
+      userId: interaction.user?.id,
+      metadata: {
+        interactionType: "select_menu",
+        customId: interaction.customId,
+        selectedValues: interaction.values,
+        selectionCount: interaction.values.length
+      }
+    });
+  }
   /**
    * Track server join or leave events
    * 
@@ -248,7 +354,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events, sdkVersion: SDK_VERSION })
+        body: JSON.stringify({ events, sdkVersion: SDK_VERSION, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -273,7 +379,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events })
+        body: JSON.stringify({ events, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -298,7 +404,7 @@ var Argus = class {
           "Content-Type": "application/json",
           "Authorization": `Bearer ${this.apiKey}`
         },
-        body: JSON.stringify({ events })
+        body: JSON.stringify({ events, discordBotId: this.discordBotId })
       });
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argus-discord-analytics",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "The all-seeing analytics SDK for Discord bots - track commands, errors, servers, and more",
   "main": "dist/index.js",
   "module": "dist/index.mjs",