Fixed some hardcoded info stuff

stevenpeh-tw · stevenpeh-tw · commit bb88e542d7b9 · 2025-08-06T16:06:29.000+10:00
diff --git a/mcp-openapi/README.md b/mcp-openapi/README.md
@@ -636,27 +636,29 @@ export async function startServer(options?: ServerOptions & { mode?: 'stdio' | '
 
 ```typescript
 interface ServerOptions {
-  specsDir?: string;        // Directory containing OpenAPI specs
-  configFile?: string;      // Path to MCP configuration file
-  promptsDir?: string;      // Directory containing prompt templates
-  port?: number;           // HTTP server port
-  verbose?: boolean;       // Enable verbose logging
-  baseUrl?: string;        // Base URL for backend APIs (overrides config file)
+  specsDir?: string;           // Directory containing OpenAPI specs
+  configFile?: string;         // Path to MCP configuration file
+  promptsDir?: string;         // Directory containing prompt templates
+  port?: number;              // HTTP server port
+  verbose?: boolean;          // Enable verbose logging
+  baseUrl?: string;           // Base URL for backend APIs (overrides config file)
+  maxToolNameLength?: number; // Maximum length for generated tool names (default: 48)
 }
 ```
 
 ## CLI Options
 
 ```
 Options:
-  -s, --specs <dir>     Directory containing OpenAPI specifications (default: "./examples/specs")
-  -c, --config <file>   Configuration file path (default: "./examples/mcp-config.json")  
-  -p, --prompts <dir>   Directory containing prompt specifications (default: "./examples/prompts")
-  --port <number>       Port for HTTP server mode (default: "4000")
-  --base-url <url>      Base URL for backend APIs (overrides config file)
-  --http                Run in HTTP server mode instead of stdio (default: false)
-  -v, --verbose         Enable verbose logging (default: true)
-  -h, --help            Display help for command
+  -s, --specs <dir>                Directory containing OpenAPI specifications (default: "./examples/specs")
+  -c, --config <file>              Configuration file path (default: "./examples/mcp-config.json")  
+  -p, --prompts <dir>              Directory containing prompt specifications (default: "./examples/prompts")
+  --port <number>                  Port for HTTP server mode (default: "4000")
+  --base-url <url>                 Base URL for backend APIs (overrides config file)
+  --max-tool-name-length <number>  Maximum length for generated tool names (default: "48")
+  --http                           Run in HTTP server mode instead of stdio (default: false)
+  -v, --verbose                    Enable verbose logging (default: true)
+  -h, --help                       Display help for command
 ```
 
 **Mode Selection:**
diff --git a/mcp-openapi/src/cli.ts b/mcp-openapi/src/cli.ts
@@ -3,20 +3,22 @@
 import { Command } from 'commander';
 import { MCPOpenAPIServer } from './server.js';
 import { ServerOptions } from './types.js';
+import { PACKAGE_NAME, PACKAGE_VERSION } from './package-info.js';
 
 const program = new Command();
 
 program
-  .name('mcp-openapi-server')
+  .name(PACKAGE_NAME)
   .description('A generic, configurable MCP server that generates tools, resources, and prompts from OpenAPI specifications')
-  .version('1.0.0');
+  .version(PACKAGE_VERSION);
 
 program
   .option('-s, --specs <dir>', 'Directory containing OpenAPI specifications', './examples/specs')
   .option('-c, --config <file>', 'Configuration file path', './examples/mcp-config.json')
   .option('-p, --prompts <dir>', 'Directory containing prompt specifications', './examples/prompts')
   .option('--port <number>', 'Port for HTTP server mode', '4000')
   .option('--base-url <url>', 'Base URL for backend APIs (overrides config file)')
+  .option('--max-tool-name-length <number>', 'Maximum length for generated tool names', '48')
   .option('--http', 'Run in HTTP server mode instead of stdio', false)
   .option('-v, --verbose', 'Enable verbose logging', true)
   .action(async (options) => {
@@ -26,7 +28,8 @@ program
       promptsDir: options.prompts,
       port: parseInt(options.port),
       verbose: options.verbose,
-      ...(options.baseUrl && { baseUrl: options.baseUrl })
+      ...(options.baseUrl && { baseUrl: options.baseUrl }),
+      ...(options.maxToolNameLength && { maxToolNameLength: parseInt(options.maxToolNameLength) })
     };
 
     const server = new MCPOpenAPIServer(serverOptions);
diff --git a/mcp-openapi/src/package-info.ts b/mcp-openapi/src/package-info.ts
@@ -0,0 +1,71 @@
+import fs from 'fs';
+import path from 'path';
+
+// Interface for package.json structure
+interface PackageInfo {
+  name: string;
+  version: string;
+  description?: string;
+}
+
+let packageInfo: PackageInfo | null = null;
+
+/**
+ * Reads and caches package.json information
+ */
+function loadPackageInfo(): PackageInfo {
+  if (packageInfo) {
+    return packageInfo;
+  }
+
+  try {
+    // Look for package.json in the project root
+    // Try multiple possible locations to be robust
+    const possiblePaths = [
+      path.resolve(process.cwd(), 'package.json'),
+      path.resolve(__dirname, '..', 'package.json'),
+      path.resolve(__dirname, '..', '..', 'package.json')
+    ];
+    
+    let packageJsonPath: string | null = null;
+    for (const possiblePath of possiblePaths) {
+      if (fs.existsSync(possiblePath)) {
+        packageJsonPath = possiblePath;
+        break;
+      }
+    }
+    
+    if (!packageJsonPath) {
+      throw new Error('package.json not found');
+    }
+    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf8');
+    const packageJson = JSON.parse(packageJsonContent);
+    
+    packageInfo = {
+      name: packageJson.name,
+      version: packageJson.version,
+      description: packageJson.description
+    };
+    
+    return packageInfo;
+  } catch (error) {
+    // Fallback to hardcoded values if package.json can't be read
+    console.warn('Warning: Could not read package.json, using fallback values');
+    packageInfo = {
+      name: 'mcp-openapi-server',
+      version: '1.0.0',
+      description: 'MCP OpenAPI Server'
+    };
+    return packageInfo;
+  }
+}
+
+// Export the package information
+export const PACKAGE_NAME = loadPackageInfo().name;
+export const PACKAGE_VERSION = loadPackageInfo().version;
+export const PACKAGE_DESCRIPTION = loadPackageInfo().description;
+
+// Export function for getting full package info
+export function getPackageInfo(): PackageInfo {
+  return loadPackageInfo();
+}
diff --git a/mcp-openapi/src/server.ts b/mcp-openapi/src/server.ts
@@ -23,6 +23,7 @@ import {
   ServerOptions
 } from './types.js';
 import { Telemetry, TelemetryContext } from './telemetry.js';
+import { PACKAGE_NAME, PACKAGE_VERSION } from './package-info.js';
 
 export class MCPOpenAPIServer {
   private server: Server;
@@ -61,6 +62,7 @@ export class MCPOpenAPIServer {
       promptsDir: './examples/prompts',
       port: 4000,
       verbose: true,
+      maxToolNameLength: 48,
       ...options
     };
 
@@ -70,7 +72,7 @@ export class MCPOpenAPIServer {
     this.options.promptsDir = path.resolve(this.options.promptsDir!);
 
     this.server = new Server(
-      { name: "mcp-openapi-server", version: "1.0.0" },
+      { name: PACKAGE_NAME, version: PACKAGE_VERSION },
       { 
         capabilities: { 
           tools: {},
@@ -329,8 +331,8 @@ export class MCPOpenAPIServer {
   private generateShortToolName(specId: string, pathPattern: string, method: string): string {
     // Server name is "mcp-openapi" (11 chars), leaving ~49 chars for tool name to stay under 60
     // Reason for short tool name is because some MCP clients like Cursor IDE, as of this writing, 
-    // has a limit of 60 chars for tool name
-    const maxToolNameLength = 48;
+    // has a limit of 60 chars for tool name + mcp server name
+    const maxToolNameLength = this.options.maxToolNameLength!;
     
     // Method abbreviations
     const methodAbbrev: Record<string, string> = {
@@ -1129,7 +1131,7 @@ export class MCPOpenAPIServer {
     
     // Step 2: Create new MCP server with LOADED capabilities 
     this.server = new Server(
-      { name: "mcp-openapi-server", version: "1.0.0" },
+      { name: PACKAGE_NAME, version: PACKAGE_VERSION },
       { 
         capabilities: { 
           tools: this.tools.reduce((acc, tool) => ({ ...acc, [tool.name]: {} }), {}),
@@ -1275,7 +1277,7 @@ export class MCPOpenAPIServer {
         tools: this.tools.length,
         resources: this.resources.length,
         prompts: this.prompts.size,
-        version: '1.0.0'
+        version: PACKAGE_VERSION
       });
     });
 
diff --git a/mcp-openapi/src/telemetry.ts b/mcp-openapi/src/telemetry.ts
@@ -7,6 +7,7 @@ import {
   MCPResource,
   ServerOptions
 } from './types.js';
+import { PACKAGE_NAME } from './package-info.js';
 
 export interface TelemetryContext {
   options: ServerOptions;
@@ -31,7 +32,7 @@ export class Telemetry {
           method: 'notifications/message',
           params: {
             level: 'debug',
-            logger: 'mcp-openapi-server',
+            logger: PACKAGE_NAME,
             data: message
           }
         }).catch(() => {
@@ -53,7 +54,7 @@ export class Telemetry {
           method: 'notifications/message',
           params: {
             level: 'info',
-            logger: 'mcp-openapi-server',
+            logger: PACKAGE_NAME,
             data: message
           }
         }).catch(() => {
@@ -74,7 +75,7 @@ export class Telemetry {
         method: 'notifications/message',
         params: {
           level: 'warning',
-          logger: 'mcp-openapi-server',
+          logger: PACKAGE_NAME,
           data: message
         }
       }).catch(() => {
@@ -94,7 +95,7 @@ export class Telemetry {
         method: 'notifications/message',
         params: {
           level: 'error',
-          logger: 'mcp-openapi-server',
+          logger: PACKAGE_NAME,
           data: message
         }
       }).catch(() => {
diff --git a/mcp-openapi/src/types.ts b/mcp-openapi/src/types.ts
@@ -78,4 +78,5 @@ export interface ServerOptions {
   port?: number;
   verbose?: boolean;
   baseUrl?: string;
+  maxToolNameLength?: number;
 } 

Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,5 @@ export interface ServerOptions {`
`78`	`78`	`port?: number;`
`79`	`79`	`verbose?: boolean;`
`80`	`80`	`baseUrl?: string;`
	`81`	`+ maxToolNameLength?: number;`
`81`	`82`	`}`