clean version tool

Author: zmofei

src/tools/BaseTool.ts

@@ -0,0 +1,57 @@
+import type {
+  McpServer,
+  RegisteredTool
+} from '@modelcontextprotocol/sdk/server/mcp.js';
+import type {
+  ToolAnnotations,
+  CallToolResult
+} from '@modelcontextprotocol/sdk/types.js';
+import type { ZodTypeAny } from 'zod';
+import type { z } from 'zod';
+
+export abstract class BaseTool<InputSchema extends ZodTypeAny> {
+  abstract readonly name: string;
+  abstract readonly description: string;
+  abstract readonly annotations: ToolAnnotations;
+
+  readonly inputSchema: InputSchema;
+  protected server: McpServer | null = null;
+
+  constructor(params: { inputSchema: InputSchema }) {
+    this.inputSchema = params.inputSchema;
+  }
+
+  /**
+   * Installs the tool to the given MCP server.
+   */
+  installTo(server: McpServer): RegisteredTool {
+    this.server = server;
+    return server.registerTool(
+      this.name,
+      {
+        title: this.annotations.title,
+        description: this.description,
+        inputSchema: (this.inputSchema as unknown as z.ZodObject<any>).shape,
+        annotations: this.annotations
+      },
+      (args, extra) => this.run(args, extra)
+    );
+  }
+
+  /**
+   * Tool logic to be implemented by subclasses.
+   */
+  abstract run(rawInput: unknown, extra?: any): Promise<CallToolResult>;
+
+  /**
+   * Helper method to send logging messages
+   */
+  protected log(
+    level: 'debug' | 'info' | 'warning' | 'error',
+    data: any
+  ): void {
+    if (this.server) {
+      this.server.server.sendLoggingMessage({ level, data });
+    }
+  }
+}

src/tools/MapboxApiBasedTool.ts

@@ -1,11 +1,7 @@
-import type {
-  McpServer,
-  RegisteredTool
-} from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { ZodTypeAny } from 'zod';
-import type { ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
+import { BaseTool } from './BaseTool.js';
 
 export const OutputSchema = z.object({
   content: z.array(
@@ -24,13 +20,12 @@ export const OutputSchema = z.object({
   isError: z.boolean().default(false)
 });
 
-export abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny> {
+export abstract class MapboxApiBasedTool<
+  InputSchema extends ZodTypeAny
+> extends BaseTool<InputSchema> {
   abstract readonly name: string;
   abstract readonly description: string;
-  abstract readonly annotations: ToolAnnotations;
-
-  readonly inputSchema: InputSchema;
-  protected server: McpServer | null = null;
+  abstract readonly annotations: import('@modelcontextprotocol/sdk/types.js').ToolAnnotations;
 
   static get mapboxAccessToken() {
     return process.env.MAPBOX_ACCESS_TOKEN;
@@ -41,7 +36,7 @@ export abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny> {
   }
 
   constructor(params: { inputSchema: InputSchema }) {
-    this.inputSchema = params.inputSchema;
+    super(params);
   }
 
   /**
@@ -132,33 +127,4 @@ export abstract class MapboxApiBasedTool<InputSchema extends ZodTypeAny> {
     _input: z.infer<InputSchema>,
     accessToken: string
   ): Promise<any>;
-
-  /**
-   * Installs the tool to the given MCP server.
-   */
-  installTo(server: McpServer): RegisteredTool {
-    this.server = server;
-    return server.registerTool(
-      this.name,
-      {
-        title: this.annotations.title,
-        description: this.description,
-        inputSchema: (this.inputSchema as unknown as z.ZodObject<any>).shape,
-        annotations: this.annotations
-      },
-      (args, extra) => this.run(args, extra)
-    );
-  }
-
-  /**
-   * Helper method to send logging messages
-   */
-  protected log(
-    level: 'debug' | 'info' | 'warning' | 'error',
-    data: any
-  ): void {
-    if (this.server) {
-      this.server.server.sendLoggingMessage({ level, data });
-    }
-  }
 }

src/tools/version-tool/VersionTool.ts

@@ -1,27 +1,24 @@
-import type {
-  McpServer,
-  RegisteredTool
-} from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
+import { BaseTool } from '../BaseTool.js';
 import { getVersionInfo } from '../../utils/versionUtils.js';
 
 const InputSchema = z.object({});
 
-export class VersionTool {
+export class VersionTool extends BaseTool<typeof InputSchema> {
   readonly name = 'version_tool';
   readonly description =
     'Get the current version information of the MCP server';
-  readonly inputSchema = InputSchema;
-  readonly annotations: ToolAnnotations = {
+  readonly annotations = {
     title: 'Version Information Tool',
     readOnlyHint: true,
     destructiveHint: false,
     idempotentHint: true,
     openWorldHint: false
   };
 
-  private server: McpServer | null = null;
+  constructor() {
+    super({ inputSchema: InputSchema });
+  }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async run(_rawInput: unknown): Promise<{
@@ -65,24 +62,4 @@ export class VersionTool {
       };
     }
   }
-
-  installTo(server: McpServer): RegisteredTool {
-    this.server = server;
-    return server.registerTool(
-      this.name,
-      {
-        title: this.annotations.title,
-        description: this.description,
-        inputSchema: this.inputSchema.shape,
-        annotations: this.annotations
-      },
-      this.run.bind(this)
-    );
-  }
-
-  private log(level: 'debug' | 'info' | 'warning' | 'error', data: any): void {
-    if (this.server) {
-      this.server.server.sendLoggingMessage({ level, data });
-    }
-  }
 }