@neverinfamous/mysql-mcp 2.3.0 → 3.0.0

package/src/adapters/mysql/tools/cluster/innodb-cluster.ts

@@ -5,7 +5,7 @@
  * 5 tools total: status, instances, topology, router status, switchover.
  */
 
-import { z } from "zod";
+import { z, ZodError } from "zod";
 import type { MySQLAdapter } from "../../MySQLAdapter.js";
 import type {
   ToolDefinition,
@@ -16,8 +16,17 @@ import type {
 // Schemas
 // =============================================================================
 
+const LimitSchemaBase = z.object({
+  limit: z.number().optional().describe("Maximum number of results"),
+});
+
 const LimitSchema = z.object({
-  limit: z.number().default(100).describe("Maximum number of results"),
+  limit: z
+    .number()
+    .int()
+    .min(0)
+    .default(100)
+    .describe("Maximum number of results"),
 });
 
 const SummarySchema = z.object({
@@ -48,8 +57,8 @@ export function createClusterStatusTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { summary } = SummarySchema.parse(params);
       try {
+        const { summary } = SummarySchema.parse(params);
         // Check for cluster metadata schema
         const schemaCheck = await adapter.executeQuery(`
                     SELECT SCHEMA_NAME
@@ -140,7 +149,12 @@ export function createClusterStatusTool(adapter: MySQLAdapter): ToolDefinition {
           isInnoDBCluster: false,
           message:
             "Unable to query cluster metadata. Ensure InnoDB Cluster is properly configured.",
-          error: error instanceof Error ? error.message : String(error),
+          error:
+            error instanceof ZodError
+              ? error.issues.map((i) => i.message).join(", ")
+              : error instanceof Error
+                ? error.message
+                : String(error),
         };
       }
     },
@@ -158,18 +172,32 @@ export function createClusterInstancesTool(
     title: "MySQL Cluster Instances",
     description: "List all instances in the InnoDB Cluster.",
     group: "cluster",
-    inputSchema: LimitSchema,
+    inputSchema: LimitSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { limit } = LimitSchema.parse(params);
+      let limit: number;
+      try {
+        ({ limit } = LimitSchema.parse(params));
+      } catch (error) {
+        return {
+          instances: [],
+          count: 0,
+          error:
+            error instanceof ZodError
+              ? error.issues.map((i) => i.message).join(", ")
+              : error instanceof Error
+                ? error.message
+                : String(error),
+        };
+      }
 
       try {
-        const result = await adapter.executeQuery(`
-                    SELECT 
+        const result = await adapter.executeQuery(
+          `SELECT 
                         i.instance_id as instanceId,
                         i.cluster_id as clusterId,
                         i.address,
@@ -181,31 +209,48 @@ export function createClusterInstancesTool(
                     FROM mysql_innodb_cluster_metadata.instances i
                     LEFT JOIN performance_schema.replication_group_members m
                         ON i.mysql_server_uuid = m.MEMBER_ID
-                    LIMIT ${String(limit)}
-                `);
+                    LIMIT ${String(limit)}`,
+          [],
+        );
 
         return {
           instances: result.rows ?? [],
           count: result.rows?.length ?? 0,
         };
-      } catch {
+      } catch (primaryError) {
         // Fallback to GR members
-        const grResult = await adapter.executeQuery(`
-                    SELECT 
+        try {
+          const grResult = await adapter.executeQuery(
+            `SELECT 
                         MEMBER_ID as serverUuid,
                         CONCAT(MEMBER_HOST, ':', MEMBER_PORT) as address,
                         MEMBER_STATE as memberState,
                         MEMBER_ROLE as memberRole,
                         MEMBER_VERSION as version
                     FROM performance_schema.replication_group_members
-                    LIMIT ${String(limit)}
-                `);
+                    LIMIT ${String(limit)}`,
+            [],
+          );
 
-        return {
-          source: "group_replication",
-          instances: grResult.rows ?? [],
-          count: grResult.rows?.length ?? 0,
-        };
+          return {
+            source: "group_replication",
+            instances: grResult.rows ?? [],
+            count: grResult.rows?.length ?? 0,
+          };
+        } catch (fallbackError) {
+          return {
+            instances: [],
+            count: 0,
+            error:
+              fallbackError instanceof Error
+                ? fallbackError.message
+                : String(fallbackError),
+            primaryError:
+              primaryError instanceof Error
+                ? primaryError.message
+                : String(primaryError),
+          };
+        }
       }
     },
   };
@@ -229,8 +274,9 @@ export function createClusterTopologyTool(
       idempotentHint: true,
     },
     handler: async (_params: unknown, _context: RequestContext) => {
-      // Get all GR members
-      const membersResult = await adapter.executeQuery(`
+      try {
+        // Get all GR members
+        const membersResult = await adapter.executeQuery(`
                 SELECT 
                     MEMBER_ID as id,
                     MEMBER_HOST as host,
@@ -242,93 +288,107 @@ export function createClusterTopologyTool(
                 ORDER BY MEMBER_ROLE DESC, MEMBER_HOST
             `);
 
-      const members = membersResult.rows ?? [];
-      const grMemberIds = new Set(
-        members.map((m) => m["id"] as string).filter(Boolean),
-      );
+        const members = membersResult.rows ?? [];
+        const grMemberIds = new Set(
+          members.map((m) => m["id"] as string).filter(Boolean),
+        );
 
-      // Cross-reference with cluster metadata for offline instances
-      let metadataOffline: Record<string, unknown>[] = [];
-      try {
-        const metaResult = await adapter.executeQuery(`
+        // Cross-reference with cluster metadata for offline instances
+        let metadataOffline: Record<string, unknown>[] = [];
+        try {
+          const metaResult = await adapter.executeQuery(`
                   SELECT 
                       mysql_server_uuid as id,
                       SUBSTRING_INDEX(address, ':', 1) as host,
                       CAST(SUBSTRING_INDEX(address, ':', -1) AS UNSIGNED) as port
                   FROM mysql_innodb_cluster_metadata.instances
               `);
-        if (metaResult.rows) {
-          metadataOffline = metaResult.rows
-            .filter((i) => !grMemberIds.has(i["id"] as string))
-            .map((i) => ({
-              id: i["id"],
-              host: i["host"],
-              port: i["port"],
-              state: "OFFLINE",
-              role: "NONE",
-              version: null,
-              source: "metadata",
-            }));
+          if (metaResult.rows) {
+            metadataOffline = metaResult.rows
+              .filter((i) => !grMemberIds.has(i["id"] as string))
+              .map((i) => ({
+                id: i["id"],
+                host: i["host"],
+                port: i["port"],
+                state: "OFFLINE",
+                role: "NONE",
+                version: null,
+                source: "metadata",
+              }));
+          }
+        } catch {
+          // Cluster metadata not available; skip
         }
-      } catch {
-        // Cluster metadata not available; skip
-      }
 
-      // Build topology representation
-      const topology = {
-        primary: members.filter((m) => m["role"] === "PRIMARY"),
-        secondaries: members.filter((m) => m["role"] === "SECONDARY"),
-        recovering: members.filter((m) => m["state"] === "RECOVERING"),
-        offline: [
-          ...members.filter(
-            (m) => m["state"] !== "ONLINE" && m["state"] !== "RECOVERING",
-          ),
-          ...metadataOffline,
-        ],
-      };
+        // Build topology representation
+        const topology = {
+          primary: members.filter((m) => m["role"] === "PRIMARY"),
+          secondaries: members.filter((m) => m["role"] === "SECONDARY"),
+          recovering: members.filter((m) => m["state"] === "RECOVERING"),
+          offline: [
+            ...members.filter(
+              (m) => m["state"] !== "ONLINE" && m["state"] !== "RECOVERING",
+            ),
+            ...metadataOffline,
+          ],
+        };
 
-      // Generate ASCII visualization
-      let ascii = "=== MySQL Cluster Topology ===\n\n";
+        // Generate ASCII visualization
+        let ascii = "=== MySQL Cluster Topology ===\n\n";
 
-      if (topology.primary.length > 0) {
-        ascii += "  PRIMARY:\n";
-        for (const p of topology.primary) {
-          const pm = p;
-          ascii += `    ★ ${pm["host"] as string}:${String(pm["port"])} (${pm["state"] as string})\n`;
+        if (topology.primary.length > 0) {
+          ascii += "  PRIMARY:\n";
+          for (const p of topology.primary) {
+            const pm = p;
+            ascii += `    ★ ${pm["host"] as string}:${String(pm["port"])} (${pm["state"] as string})\n`;
+          }
         }
-      }
 
-      if (topology.secondaries.length > 0) {
-        ascii += "\n  SECONDARY:\n";
-        for (const s of topology.secondaries) {
-          const sm = s;
-          ascii += `    ○ ${sm["host"] as string}:${String(sm["port"])} (${sm["state"] as string})\n`;
+        if (topology.secondaries.length > 0) {
+          ascii += "\n  SECONDARY:\n";
+          for (const s of topology.secondaries) {
+            const sm = s;
+            ascii += `    ○ ${sm["host"] as string}:${String(sm["port"])} (${sm["state"] as string})\n`;
+          }
         }
-      }
 
-      if (topology.recovering.length > 0) {
-        ascii += "\n  RECOVERING:\n";
-        for (const r of topology.recovering) {
-          const rm = r;
-          ascii += `    ⟳ ${rm["host"] as string}:${String(rm["port"])}\n`;
+        if (topology.recovering.length > 0) {
+          ascii += "\n  RECOVERING:\n";
+          for (const r of topology.recovering) {
+            const rm = r;
+            ascii += `    ⟳ ${rm["host"] as string}:${String(rm["port"])}\n`;
+          }
         }
-      }
 
-      if (topology.offline.length > 0) {
-        ascii += "\n  OFFLINE/ERROR:\n";
-        for (const o of topology.offline) {
-          const om = o;
-          ascii += `    ✗ ${om["host"] as string}:${String(om["port"])} (${om["state"] as string})\n`;
+        if (topology.offline.length > 0) {
+          ascii += "\n  OFFLINE/ERROR:\n";
+          for (const o of topology.offline) {
+            const om = o;
+            ascii += `    ✗ ${om["host"] as string}:${String(om["port"])} (${om["state"] as string})\n`;
+          }
         }
-      }
 
-      const allMembers = members.length + metadataOffline.length;
-      return {
-        topology,
-        visualization: ascii,
-        totalMembers: allMembers,
-        onlineMembers: members.filter((m) => m["state"] === "ONLINE").length,
-      };
+        const allMembers = members.length + metadataOffline.length;
+        return {
+          topology,
+          visualization: ascii,
+          totalMembers: allMembers,
+          onlineMembers: members.filter((m) => m["state"] === "ONLINE").length,
+        };
+      } catch (error) {
+        return {
+          topology: {
+            primary: [],
+            secondaries: [],
+            recovering: [],
+            offline: [],
+          },
+          visualization: "",
+          totalMembers: 0,
+          onlineMembers: 0,
+          error: error instanceof Error ? error.message : String(error),
+        };
+      }
     },
   };
 }
@@ -351,8 +411,6 @@ export function createClusterRouterStatusTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { summary } = SummarySchema.parse(params);
-
       // Compute staleness: null lastCheckIn or >1 hour old
       const computeStale = (lastCheckIn: unknown): boolean => {
         if (lastCheckIn == null) return true;
@@ -362,6 +420,7 @@ export function createClusterRouterStatusTool(
       };
 
       try {
+        const { summary } = SummarySchema.parse(params);
         // Summary mode: return only essential router info
         if (summary) {
           const result = await adapter.executeQuery(`
@@ -428,13 +487,19 @@ export function createClusterRouterStatusTool(
           count: routers.length,
           staleCount,
         };
-      } catch {
+      } catch (error) {
         return {
           available: false,
           message:
             "Router metadata not available. Ensure InnoDB Cluster is configured.",
           suggestion:
             "Use mysql_router_status tool if connecting directly to Router REST API.",
+          error:
+            error instanceof ZodError
+              ? error.issues.map((i) => i.message).join(", ")
+              : error instanceof Error
+                ? error.message
+                : String(error),
         };
       }
     },
@@ -460,8 +525,9 @@ export function createClusterSwitchoverTool(
       idempotentHint: true,
     },
     handler: async (_params: unknown, _context: RequestContext) => {
-      // Get current members status
-      const membersResult = await adapter.executeQuery(`
+      try {
+        // Get current members status
+        const membersResult = await adapter.executeQuery(`
                 SELECT 
                     m.MEMBER_ID as memberId,
                     m.MEMBER_HOST as host,
@@ -476,71 +542,79 @@ export function createClusterSwitchoverTool(
                     ON m.MEMBER_ID = s.MEMBER_ID
             `);
 
-      const members = membersResult.rows ?? [];
-      const onlineSecondaries = members.filter((m) => {
-        const member = m;
-        return member["state"] === "ONLINE" && member["role"] === "SECONDARY";
-      });
-
-      // Analyze each secondary for switchover suitability
-      const candidates = onlineSecondaries.map((s) => {
-        const sec = s;
-        const txQueue = (sec["txQueue"] as number) ?? 0;
-        const applierQueue = (sec["applierQueue"] as number) ?? 0;
-        const totalQueue = txQueue + applierQueue;
-
-        let suitability: "GOOD" | "ACCEPTABLE" | "NOT_RECOMMENDED";
-        let reason: string;
-
-        if (totalQueue === 0) {
-          suitability = "GOOD";
-          reason = "Fully synchronized";
-        } else if (totalQueue < 100) {
-          suitability = "ACCEPTABLE";
-          reason = `Minor lag: ${String(totalQueue)} transactions pending`;
-        } else {
-          suitability = "NOT_RECOMMENDED";
-          reason = `Significant lag: ${String(totalQueue)} transactions pending`;
-        }
+        const members = membersResult.rows ?? [];
+        const onlineSecondaries = members.filter((m) => {
+          const member = m;
+          return member["state"] === "ONLINE" && member["role"] === "SECONDARY";
+        });
 
+        // Analyze each secondary for switchover suitability
+        const candidates = onlineSecondaries.map((s) => {
+          const sec = s;
+          const txQueue = (sec["txQueue"] as number) ?? 0;
+          const applierQueue = (sec["applierQueue"] as number) ?? 0;
+          const totalQueue = txQueue + applierQueue;
+
+          let suitability: "GOOD" | "ACCEPTABLE" | "NOT_RECOMMENDED";
+          let reason: string;
+
+          if (totalQueue === 0) {
+            suitability = "GOOD";
+            reason = "Fully synchronized";
+          } else if (totalQueue < 100) {
+            suitability = "ACCEPTABLE";
+            reason = `Minor lag: ${String(totalQueue)} transactions pending`;
+          } else {
+            suitability = "NOT_RECOMMENDED";
+            reason = `Significant lag: ${String(totalQueue)} transactions pending`;
+          }
+
+          return {
+            memberId: sec["memberId"],
+            host: sec["host"],
+            port: sec["port"],
+            version: sec["version"],
+            txQueue,
+            applierQueue,
+            suitability,
+            reason,
+          };
+        });
+
+        // Sort by suitability
+        candidates.sort((a, b) => {
+          const order = { GOOD: 0, ACCEPTABLE: 1, NOT_RECOMMENDED: 2 };
+          return order[a.suitability] - order[b.suitability];
+        });
+
+        const firstCandidate = candidates[0];
         return {
-          memberId: sec["memberId"],
-          host: sec["host"],
-          port: sec["port"],
-          version: sec["version"],
-          txQueue,
-          applierQueue,
-          suitability,
-          reason,
+          currentPrimary: members.find((m) => m["role"] === "PRIMARY") ?? null,
+          candidates,
+          recommendedTarget:
+            candidates.length > 0 &&
+            firstCandidate &&
+            firstCandidate.suitability !== "NOT_RECOMMENDED"
+              ? firstCandidate
+              : null,
+          canSwitchover: candidates.some(
+            (c) => c.suitability !== "NOT_RECOMMENDED",
+          ),
+          warning:
+            onlineSecondaries.length === 0
+              ? "No online secondaries available for switchover."
+              : candidates.every((c) => c.suitability === "NOT_RECOMMENDED")
+                ? "All secondaries have significant replication lag. Switchover not recommended."
+                : undefined,
         };
-      });
-
-      // Sort by suitability
-      candidates.sort((a, b) => {
-        const order = { GOOD: 0, ACCEPTABLE: 1, NOT_RECOMMENDED: 2 };
-        return order[a.suitability] - order[b.suitability];
-      });
-
-      const firstCandidate = candidates[0];
-      return {
-        currentPrimary: members.find((m) => m["role"] === "PRIMARY"),
-        candidates,
-        recommendedTarget:
-          candidates.length > 0 &&
-          firstCandidate &&
-          firstCandidate.suitability !== "NOT_RECOMMENDED"
-            ? firstCandidate
-            : null,
-        canSwitchover: candidates.some(
-          (c) => c.suitability !== "NOT_RECOMMENDED",
-        ),
-        warning:
-          onlineSecondaries.length === 0
-            ? "No online secondaries available for switchover."
-            : candidates.every((c) => c.suitability === "NOT_RECOMMENDED")
-              ? "All secondaries have significant replication lag. Switchover not recommended."
-              : undefined,
-      };
+      } catch (error) {
+        return {
+          currentPrimary: null,
+          candidates: [],
+          canSwitchover: false,
+          error: error instanceof Error ? error.message : String(error),
+        };
+      }
     },
   };
 }