stoatx 0.3.0 → 0.5.0

package/dist/handler.js

@@ -0,0 +1,355 @@
+import "reflect-metadata";
+import { CommandRegistry } from "./registry";
+import { Client as StoatClient } from "stoat.js";
+/**
+ * Client - An extended Client that integrates StoatxHandler directly
+ *
+ * @example
+ * ```ts
+ * import { Client } from 'stoatx';
+ *
+ * const client = new Client({
+ *   prefix: '!',
+ *   owners: ['owner-user-id'],
+ * });
+ *
+ * await client.initCommands();
+ * ```
+ */
+export class Client extends StoatClient {
+    handler;
+    constructor(options) {
+        super();
+        this.handler = new StoatxHandler({ ...options, client: this });
+        // Automatically hook up the message handler
+        this.on("messageCreate", async (message) => {
+            await this.handler.handle(message);
+        });
+    }
+    /**
+     * Initialize the StoatxHandler commands
+     */
+    async initCommands() {
+        await this.handler.init();
+    }
+}
+/**
+ * StoatxHandler - The execution engine for commands
+ *
+ * Handles message parsing, middleware execution, and command dispatching
+ *
+ * @internal This class is not intended to be instantiated directly. Use the `Client` from `stoatx` instead.
+ */
+export class StoatxHandler {
+    commandsDir;
+    discoveryOptions;
+    prefixResolver;
+    owners;
+    registry;
+    cooldowns = new Map();
+    disableMentionPrefix;
+    client;
+    constructor(options) {
+        this.client = options.client;
+        this.commandsDir = options.commandsDir;
+        this.discoveryOptions = options.discovery;
+        this.prefixResolver = options.prefix;
+        this.owners = new Set(options.owners ?? []);
+        this.registry = new CommandRegistry(options.extensions);
+        this.disableMentionPrefix = options.disableMentionPrefix ?? false;
+    }
+    /**
+     * Initialize the handler - load all commands
+     */
+    async init() {
+        if (this.commandsDir) {
+            await this.registry.loadFromDirectory(this.commandsDir);
+        }
+        else {
+            await this.registry.autoDiscover(this.discoveryOptions);
+        }
+        this.attachEvents();
+    }
+    /**
+     * Attach registered events to the client
+     */
+    attachEvents() {
+        const events = this.registry.getEvents();
+        for (const eventDef of events) {
+            const handler = async (...args) => {
+                try {
+                    await eventDef.instance[eventDef.methodName](...args, this.client);
+                }
+                catch (error) {
+                    console.error(`[Stoatx] Event Handler Error in @${eventDef.type === "on" ? "On" : "Once"}('${eventDef.event}'):`, error);
+                }
+            };
+            if (eventDef.type === "once") {
+                this.client.once(eventDef.event, handler);
+            }
+            else {
+                this.client.on(eventDef.event, handler);
+            }
+        }
+    }
+    /**
+     * Parse a raw message into command context
+     */
+    async parseMessage(rawContent, message, meta) {
+        const prefix = await this.resolvePrefix(meta.serverId);
+        let usedPrefix = prefix;
+        let withoutPrefix = "";
+        // Check for string prefix
+        if (rawContent.startsWith(prefix)) {
+            withoutPrefix = rawContent.slice(prefix.length).trim();
+            usedPrefix = prefix;
+        }
+        // Check for mention prefix (e.g., "<@bot-id> command") - unless disabled
+        else if (!this.disableMentionPrefix && rawContent.match(/^<@!?[\w]+>/)) {
+            const mentionMatch = rawContent.match(/^<@!?([\w]+)>\s*/);
+            if (mentionMatch) {
+                const mentionedId = mentionMatch[1];
+                const botId = this.client.user?.id;
+                // Only process if mentioned user is the bot
+                if (botId && mentionedId === botId) {
+                    usedPrefix = mentionMatch[0];
+                    withoutPrefix = rawContent.slice(mentionMatch[0].length).trim();
+                }
+                else {
+                }
+            }
+        }
+        if (!withoutPrefix) {
+            return null;
+        }
+        const [commandName, ...args] = withoutPrefix.split(/\s+/);
+        if (!commandName) {
+            return null;
+        }
+        return {
+            client: this.client,
+            content: rawContent,
+            authorId: meta.authorId,
+            channelId: meta.channelId,
+            serverId: meta.serverId,
+            args,
+            prefix: usedPrefix,
+            commandName: commandName.toLowerCase(),
+            reply: meta.reply,
+            message,
+        };
+    }
+    /**
+     * Handle a message object using the configured message adapter
+     *
+     * @example
+     * ```ts
+     * // With message adapter configured
+     * client.on('messageCreate', (message) => {
+     *   handler.handle(message);
+     * });
+     * ```
+     */
+    async handle(message) {
+        if (!message.channel || !message.author) {
+            return false;
+        }
+        // Skip messages from bots
+        if (message.author.bot) {
+            return false;
+        }
+        const rawContent = message.content;
+        const authorId = message.author.id;
+        const channelId = message.channel.id;
+        const serverId = message.server?.id;
+        const reply = async (content) => {
+            return await message.channel.sendMessage(content);
+        };
+        return this.handleMessage(rawContent, message, {
+            authorId,
+            channelId,
+            serverId,
+            reply,
+        });
+    }
+    /**
+     * Handle a raw message string with metadata
+     *
+     * @example
+     * ```ts
+     * // Manual usage without message adapter
+     * client.on('messageCreate', (message) => {
+     *   handler.handleMessage(message.content, message, {
+     *     authorId: message.author.id,
+     *     channelId: message.channel.id,
+     *     serverId: message.server?.id,
+     *     reply: (content) => message.channel.sendMessage(content),
+     *   });
+     * });
+     * ```
+     */
+    async handleMessage(rawContent, message, meta) {
+        const ctx = await this.parseMessage(rawContent, message, meta);
+        if (!ctx) {
+            return false;
+        }
+        return this.execute(ctx);
+    }
+    /**
+     * Execute a command with the given context
+     */
+    async execute(ctx) {
+        const registered = this.registry.get(ctx.commandName);
+        if (!registered) {
+            return false;
+        }
+        const { instance, metadata, methodName, classConstructor } = registered;
+        // Owner-only check
+        if (metadata.ownerOnly && !this.owners.has(ctx.authorId)) {
+            await ctx.reply("This command is owner-only.");
+            return false;
+        }
+        // Guard checks - use classConstructor for guard metadata
+        const guards = Reflect.getMetadata("stoatx:command:guards", classConstructor) || [];
+        for (const guardClass of guards) {
+            const guardInstance = new guardClass();
+            if (typeof guardInstance.run === "function") {
+                const guardResult = await guardInstance.run(ctx);
+                if (!guardResult) {
+                    if (typeof guardInstance.guardFail === "function") {
+                        await guardInstance.guardFail(ctx);
+                    }
+                    else {
+                        console.error("[Stoatx] Guard check failed but no guardFail method defined on", guardClass.name);
+                    }
+                    return false;
+                }
+            }
+        }
+        // Cooldown check
+        if (!this.checkCooldown(ctx.authorId, metadata)) {
+            const remaining = this.getRemainingCooldown(ctx.authorId, metadata);
+            // For method-based commands, check if instance has onCooldown
+            if (typeof instance.onCooldown === "function") {
+                await instance.onCooldown(ctx, remaining);
+            }
+            else {
+                await ctx.reply(`Please wait ${(remaining / 1000).toFixed(1)} seconds before using this command again.`);
+            }
+            return false;
+        }
+        try {
+            await instance[methodName](ctx);
+            // Set cooldown after successful execution
+            if (metadata.cooldown > 0) {
+                this.setCooldown(ctx.authorId, metadata);
+            }
+            return true;
+        }
+        catch (error) {
+            // Handle errors
+            if (typeof instance.onError === "function") {
+                await instance.onError(ctx, error);
+            }
+            else {
+                console.error(`[Stoatx] Error in command ${metadata.name}:`, error);
+                await ctx.reply(`An error occurred: ${error.message}`);
+            }
+            return false;
+        }
+    }
+    /**
+     * Get the command registry
+     */
+    getRegistry() {
+        return this.registry;
+    }
+    /**
+     * Get a command by name or alias
+     */
+    getCommand(name) {
+        return this.registry.get(name);
+    }
+    /**
+     * Get all commands
+     */
+    getCommands() {
+        return this.registry.getAll();
+    }
+    /**
+     * Reload all commands
+     */
+    async reload() {
+        this.registry.clear();
+        this.cooldowns.clear();
+        if (this.commandsDir) {
+            await this.registry.loadFromDirectory(this.commandsDir);
+            return;
+        }
+        await this.registry.autoDiscover(this.discoveryOptions);
+    }
+    /**
+     * Check if a user is an owner
+     */
+    isOwner(userId) {
+        return this.owners.has(userId);
+    }
+    /**
+     * Add an owner
+     */
+    addOwner(userId) {
+        this.owners.add(userId);
+    }
+    /**
+     * Remove an owner
+     */
+    removeOwner(userId) {
+        this.owners.delete(userId);
+    }
+    /**
+     * Resolve the prefix for a context
+     */
+    async resolvePrefix(serverId) {
+        if (typeof this.prefixResolver === "function") {
+            return this.prefixResolver({ serverId });
+        }
+        return this.prefixResolver;
+    }
+    /**
+     * Check if user is on cooldown
+     */
+    checkCooldown(userId, metadata) {
+        if (metadata.cooldown <= 0)
+            return true;
+        const commandCooldowns = this.cooldowns.get(metadata.name);
+        if (!commandCooldowns)
+            return true;
+        const userCooldown = commandCooldowns.get(userId);
+        if (!userCooldown)
+            return true;
+        return Date.now() >= userCooldown;
+    }
+    /**
+     * Get remaining cooldown time in ms
+     */
+    getRemainingCooldown(userId, metadata) {
+        const commandCooldowns = this.cooldowns.get(metadata.name);
+        if (!commandCooldowns)
+            return 0;
+        const userCooldown = commandCooldowns.get(userId);
+        if (!userCooldown)
+            return 0;
+        return Math.max(0, userCooldown - Date.now());
+    }
+    /**
+     * Set cooldown for a user
+     */
+    setCooldown(userId, metadata) {
+        if (!this.cooldowns.has(metadata.name)) {
+            this.cooldowns.set(metadata.name, new Map());
+        }
+        const commandCooldowns = this.cooldowns.get(metadata.name);
+        commandCooldowns.set(userId, Date.now() + metadata.cooldown);
+    }
+}
+//# sourceMappingURL=handler.js.map

package/dist/handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-import { Client as Client$1, Message } from 'stoat.js';
+import { Client as Client$1, Message } from '@stoatx/client';
+export * from '@stoatx/client';
 
 /**
  * Permission types for commands
@@ -60,7 +61,7 @@ interface CommandContext {
     /** The command name used (could be an alias) */
     commandName: string;
     /** Reply to the message */
-    reply: (content: string) => Promise<void>;
+    reply: (content: string) => Promise<Message>;
     /** The original message object (platform-specific) */
     message: Message;
 }
@@ -456,7 +457,7 @@ declare class StoatxHandler {
         authorId: string;
         channelId: string;
         serverId?: string;
-        reply: (content: string) => Promise<void>;
+        reply: (content: string) => Promise<Message>;
     }): Promise<CommandContext | null>;
     /**
      * Handle a message object using the configured message adapter
@@ -490,7 +491,7 @@ declare class StoatxHandler {
         authorId: string;
         channelId: string;
         serverId?: string;
-        reply: (content: string) => Promise<void>;
+        reply: (content: string) => Promise<Message>;
     }): Promise<boolean>;
     /**
      * Execute a command with the given context

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Client as Client$1, Message } from 'stoat.js';
+import { Client as Client$1, Message } from '@stoatx/client';
+export * from '@stoatx/client';
 
 /**
  * Permission types for commands
@@ -60,7 +61,7 @@ interface CommandContext {
     /** The command name used (could be an alias) */
     commandName: string;
     /** Reply to the message */
-    reply: (content: string) => Promise<void>;
+    reply: (content: string) => Promise<Message>;
     /** The original message object (platform-specific) */
     message: Message;
 }
@@ -456,7 +457,7 @@ declare class StoatxHandler {
         authorId: string;
         channelId: string;
         serverId?: string;
-        reply: (content: string) => Promise<void>;
+        reply: (content: string) => Promise<Message>;
     }): Promise<CommandContext | null>;
     /**
      * Handle a message object using the configured message adapter
@@ -490,7 +491,7 @@ declare class StoatxHandler {
         authorId: string;
         channelId: string;
         serverId?: string;
-        reply: (content: string) => Promise<void>;
+        reply: (content: string) => Promise<Message>;
     }): Promise<boolean>;
     /**
      * Execute a command with the given context

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,SAAS,CAAC;AAGxB,cAAc,cAAc,CAAC;AAG7B,cAAc,YAAY,CAAC;AAG3B,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -59,13 +60,14 @@ var METADATA_KEYS = {
 
 // src/decorators/store.ts
 var DecoratorStore = class _DecoratorStore {
+  static instance;
+  /** Stoat classes with their SimpleCommand methods */
+  stoatClasses = /* @__PURE__ */ new Map();
+  /** Registered commands from @Stoat/@SimpleCommand decorators */
+  commands = [];
+  /** Whether the store has been initialized */
+  initialized = false;
   constructor() {
-    /** Stoat classes with their SimpleCommand methods */
-    this.stoatClasses = /* @__PURE__ */ new Map();
-    /** Registered commands from @Stoat/@SimpleCommand decorators */
-    this.commands = [];
-    /** Whether the store has been initialized */
-    this.initialized = false;
   }
   static getInstance() {
     if (!_DecoratorStore.instance) {
@@ -209,12 +211,20 @@ var path = __toESM(require("path"));
 var fs = __toESM(require("fs/promises"));
 var import_node_url = require("url");
 var import_tinyglobby = require("tinyglobby");
-var _CommandRegistry = class _CommandRegistry {
+var CommandRegistry = class _CommandRegistry {
+  static DEFAULT_AUTO_DISCOVERY_IGNORES = [
+    "**/node_modules/**",
+    "**/.git/**",
+    "**/*.d.ts",
+    "**/*.test.*",
+    "**/*.spec.*"
+  ];
+  commands = /* @__PURE__ */ new Map();
+  aliases = /* @__PURE__ */ new Map();
+  registeredEvents = [];
+  extensions;
+  processedStoatClasses = /* @__PURE__ */ new Set();
   constructor(extensions = [".js", ".mjs", ".cjs"]) {
-    this.commands = /* @__PURE__ */ new Map();
-    this.aliases = /* @__PURE__ */ new Map();
-    this.registeredEvents = [];
-    this.processedStoatClasses = /* @__PURE__ */ new Set();
     this.extensions = extensions;
   }
   /**
@@ -273,7 +283,7 @@ var _CommandRegistry = class _CommandRegistry {
   async isLikelyCommandModule(filePath) {
     try {
       const source = await fs.readFile(filePath, "utf8");
-      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("Command") || source.includes("stoatx:command");
+      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("stoatx:command");
     } catch {
       return true;
     }
@@ -462,19 +472,12 @@ var _CommandRegistry = class _CommandRegistry {
     return void 0;
   }
 };
-_CommandRegistry.DEFAULT_AUTO_DISCOVERY_IGNORES = [
-  "**/node_modules/**",
-  "**/.git/**",
-  "**/*.d.ts",
-  "**/*.test.*",
-  "**/*.spec.*"
-];
-var CommandRegistry = _CommandRegistry;
 
 // src/handler.ts
 var import_reflect_metadata5 = require("reflect-metadata");
-var import_stoat = require("stoat.js");
-var Client = class extends import_stoat.Client {
+var import_client = require("@stoatx/client");
+var Client = class extends import_client.Client {
+  handler;
   constructor(options) {
     super();
     this.handler = new StoatxHandler({ ...options, client: this });
@@ -490,8 +493,15 @@ var Client = class extends import_stoat.Client {
   }
 };
 var StoatxHandler = class {
+  commandsDir;
+  discoveryOptions;
+  prefixResolver;
+  owners;
+  registry;
+  cooldowns = /* @__PURE__ */ new Map();
+  disableMentionPrefix;
+  client;
   constructor(options) {
-    this.cooldowns = /* @__PURE__ */ new Map();
     this.client = options.client;
     this.commandsDir = options.commandsDir;
     this.discoveryOptions = options.discovery;
@@ -527,10 +537,11 @@ var StoatxHandler = class {
           );
         }
       };
+      const eventName = eventDef.event;
       if (eventDef.type === "once") {
-        this.client.once(eventDef.event, handler);
+        this.client.once(eventName, handler);
       } else {
-        this.client.on(eventDef.event, handler);
+        this.client.on(eventName, handler);
       }
     }
   }
@@ -599,7 +610,7 @@ var StoatxHandler = class {
     const channelId = message.channel.id;
     const serverId = message.server?.id;
     const reply = async (content) => {
-      await message.channel.sendMessage(content);
+      return await message.channel.sendMessage(content);
     };
     return this.handleMessage(rawContent, message, {
       authorId,
@@ -773,6 +784,9 @@ var StoatxHandler = class {
     commandCooldowns.set(userId, Date.now() + metadata.cooldown);
   }
 };
+
+// src/index.ts
+__reExport(index_exports, require("@stoatx/client"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Client,
@@ -787,5 +801,6 @@ var StoatxHandler = class {
   getEventsMetadata,
   getGuards,
   getSimpleCommands,
-  isStoatClass
+  isStoatClass,
+  ...require("@stoatx/client")
 });

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,QAAQ;AACR,cAAc,SAAS,CAAC;AAExB,aAAa;AACb,cAAc,cAAc,CAAC;AAE7B,WAAW;AACX,cAAc,YAAY,CAAC;AAE3B,UAAU;AACV,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC"}