@neverinfamous/mysql-mcp 2.3.0 → 3.0.0

package/src/adapters/mysql/tools/replication.ts

@@ -7,7 +7,7 @@
 
 import type { MySQLAdapter } from "../MySQLAdapter.js";
 import type { ToolDefinition, RequestContext } from "../../../types/index.js";
-import { BinlogEventsSchema } from "../types.js";
+import { BinlogEventsSchemaBase, BinlogEventsSchema } from "../types.js";
 import { z } from "zod";
 
 /**
@@ -48,8 +48,8 @@ function createMasterStatusTool(adapter: MySQLAdapter): ToolDefinition {
           return { status: result.rows?.[0] };
         } catch (e) {
           return {
-            error: "Binary logging may not be enabled",
-            details: String(e),
+            success: false,
+            error: `Binary logging may not be enabled: ${String(e)}`,
           };
         }
       }
@@ -105,65 +105,85 @@ function createBinlogEventsTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "View binary log events for point-in-time recovery or replication debugging.",
     group: "replication",
-    inputSchema: BinlogEventsSchema,
+    inputSchema: BinlogEventsSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { logFile, position, limit } = BinlogEventsSchema.parse(params);
+      try {
+        const { logFile, position, limit } = BinlogEventsSchema.parse(params);
 
-      // Resolve effective log file: use provided or fetch current from master status
-      let effectiveLogFile = logFile;
-      if (!effectiveLogFile) {
-        try {
-          let masterResult;
+        // Guard: LIMIT 0 on SHOW BINLOG EVENTS returns ALL events (unlike SELECT LIMIT 0)
+        if (limit === 0) {
+          return { events: [] };
+        }
+
+        // Resolve effective log file: use provided or fetch current from master status
+        let effectiveLogFile = logFile;
+        if (!effectiveLogFile) {
           try {
-            masterResult = await adapter.executeQuery("SHOW BINARY LOG STATUS");
+            let masterResult;
+            try {
+              masterResult = await adapter.executeQuery(
+                "SHOW BINARY LOG STATUS",
+              );
+            } catch {
+              masterResult = await adapter.executeQuery("SHOW MASTER STATUS");
+            }
+            const currentFile = masterResult.rows?.[0]?.["File"] as
+              | string
+              | undefined;
+            if (currentFile) {
+              effectiveLogFile = currentFile;
+            }
           } catch {
-            masterResult = await adapter.executeQuery("SHOW MASTER STATUS");
-          }
-          const currentFile = masterResult.rows?.[0]?.["File"] as
-            | string
-            | undefined;
-          if (currentFile) {
-            effectiveLogFile = currentFile;
+            // Binary logging may not be enabled; fall through to default behavior
           }
-        } catch {
-          // Binary logging may not be enabled; fall through to default behavior
         }
-      }
 
-      let sql = "SHOW BINLOG EVENTS";
-      const parts: string[] = [];
+        let sql = "SHOW BINLOG EVENTS";
+        const parts: string[] = [];
 
-      if (effectiveLogFile) {
-        parts.push(`IN '${effectiveLogFile}'`);
-      }
-      if (position != null) {
-        parts.push(`FROM ${position}`);
-      }
-      parts.push(`LIMIT ${limit}`);
+        if (effectiveLogFile) {
+          parts.push(`IN '${effectiveLogFile}'`);
+        }
+        if (position != null) {
+          parts.push(`FROM ${position}`);
+        }
+        parts.push(`LIMIT ${limit}`);
 
-      sql += " " + parts.join(" ");
+        sql += " " + parts.join(" ");
 
-      try {
-        const result = await adapter.executeQuery(sql);
-        return { events: result.rows };
+        try {
+          const result = await adapter.executeQuery(sql);
+          return { events: result.rows };
+        } catch (e) {
+          const message = String(e);
+          const targetFile = effectiveLogFile || logFile;
+          if (targetFile && message.includes("Could not find target log")) {
+            return {
+              success: false,
+              logFile: targetFile,
+              error: `Binlog file '${targetFile}' not found`,
+            };
+          }
+          return {
+            success: false,
+            error: `Failed to read binlog events: ${message}`,
+          };
+        }
       } catch (e) {
-        const message = String(e);
-        const targetFile = effectiveLogFile || logFile;
-        if (targetFile && message.includes("Could not find target log")) {
+        if (e instanceof z.ZodError) {
           return {
             success: false,
-            logFile: targetFile,
-            error: `Binlog file '${targetFile}' not found`,
+            error: e.issues.map((i) => i.message).join("; "),
           };
         }
         return {
           success: false,
-          error: `Failed to read binlog events: ${message}`,
+          error: `Failed to read binlog events: ${String(e)}`,
         };
       }
     },
@@ -185,26 +205,33 @@ function createGtidStatusTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (_params: unknown, _context: RequestContext) => {
-      // Get GTID executed
-      const executedResult = await adapter.executeQuery(
-        "SELECT @@global.gtid_executed as gtid_executed",
-      );
+      try {
+        // Get GTID executed
+        const executedResult = await adapter.executeQuery(
+          "SELECT @@global.gtid_executed as gtid_executed",
+        );
 
-      // Get GTID purged
-      const purgedResult = await adapter.executeQuery(
-        "SELECT @@global.gtid_purged as gtid_purged",
-      );
+        // Get GTID purged
+        const purgedResult = await adapter.executeQuery(
+          "SELECT @@global.gtid_purged as gtid_purged",
+        );
 
-      // Get GTID mode
-      const modeResult = await adapter.executeQuery(
-        "SELECT @@global.gtid_mode as gtid_mode",
-      );
+        // Get GTID mode
+        const modeResult = await adapter.executeQuery(
+          "SELECT @@global.gtid_mode as gtid_mode",
+        );
 
-      return {
-        gtidExecuted: executedResult.rows?.[0]?.["gtid_executed"],
-        gtidPurged: purgedResult.rows?.[0]?.["gtid_purged"],
-        gtidMode: modeResult.rows?.[0]?.["gtid_mode"],
-      };
+        return {
+          gtidExecuted: executedResult.rows?.[0]?.["gtid_executed"],
+          gtidPurged: purgedResult.rows?.[0]?.["gtid_purged"],
+          gtidMode: modeResult.rows?.[0]?.["gtid_mode"],
+        };
+      } catch (e) {
+        return {
+          success: false,
+          error: `Failed to retrieve GTID status: ${String(e)}`,
+        };
+      }
     },
   };
 }