@ivotoby/openapi-mcp-server 1.6.0 → 1.6.1

package/dist/bundle.js

@@ -14286,7 +14286,7 @@ var js_yaml_default = jsYaml;
 // src/openapi-loader.ts
 import crypto from "crypto";
 
-// src/abbreviations.ts
+// src/utils/abbreviations.ts
 var REVISED_COMMON_WORDS_TO_REMOVE = [
   "controller",
   "api",
@@ -14371,6 +14371,21 @@ var WORD_ABBREVIATIONS = {
   query: "Qry"
 };
 
+// src/utils/tool-id.ts
+function parseToolId(toolId) {
+  const [method, pathPart] = toolId.split("::", 2);
+  const path = pathPart ? "/" + pathPart.replace(/-/g, "/") : "";
+  return { method, path };
+}
+function sanitizeForToolId(input) {
+  return input.replace(/[^A-Za-z0-9_-]/g, "").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-");
+}
+function generateToolId(method, path) {
+  const cleanPath = path.replace(/^\//, "").replace(/\{([^}]+)\}/g, "$1").replace(/\//g, "-");
+  const sanitizedPath = sanitizeForToolId(cleanPath);
+  return `${method.toUpperCase()}::${sanitizedPath}`;
+}
+
 // src/openapi-loader.ts
 var OpenAPISpecLoader = class {
   /**
@@ -14562,9 +14577,8 @@ var OpenAPISpecLoader = class {
           continue;
         }
         const op = operation;
-        const cleanPath = path.replace(/^\//, "").replace(/\{([^}]+)\}/g, "$1");
-        const toolId = `${method.toUpperCase()}-${cleanPath}`.replace(/[^a-zA-Z0-9-]/g, "-");
-        let nameSource = op.operationId || op.summary || `${method.toUpperCase()} ${path}`;
+        const toolId = generateToolId(method, path);
+        const nameSource = op.operationId || op.summary || `${method.toUpperCase()} ${path}`;
         const name = this.abbreviateOperationId(nameSource);
         const tool = {
           name,
@@ -14574,6 +14588,7 @@ var OpenAPISpecLoader = class {
             properties: {}
           }
         };
+        tool["x-original-path"] = path;
         const requiredParams = [];
         if (op.parameters) {
           for (const param of op.parameters) {
@@ -14940,11 +14955,12 @@ var ToolsManager = class {
   }
   /**
    * Get the path and method from a tool ID
+   *
+   * Note: This converts hyphens back to slashes to reconstruct the original API path.
+   * This is consistent with ApiClient.parseToolId() which needs the actual path for HTTP requests.
    */
   parseToolId(toolId) {
-    const [method, ...pathParts] = toolId.split("-");
-    const path = "/" + pathParts.join("/").replace(/-/g, "/");
-    return { method, path };
+    return parseToolId(toolId);
   }
 };
 
@@ -18394,13 +18410,9 @@ var ApiClient = class {
       if (axios_default.isAxiosError(error)) {
         const axiosError = error;
         if (!isRetry && isAuthError(axiosError)) {
-          try {
-            const shouldRetry = await this.authProvider.handleAuthError(axiosError);
-            if (shouldRetry) {
-              return this.executeApiCallWithRetry(toolId, params, true);
-            }
-          } catch (authHandlerError) {
-            throw authHandlerError;
+          const shouldRetry = await this.authProvider.handleAuthError(axiosError);
+          if (shouldRetry) {
+            return this.executeApiCallWithRetry(toolId, params, true);
           }
         }
         throw new Error(
@@ -18413,13 +18425,11 @@ var ApiClient = class {
   /**
    * Parse a tool ID into HTTP method and path
    *
-   * @param toolId - Tool ID in format METHOD-path-parts
+   * @param toolId - Tool ID in format METHOD::pathPart
    * @returns Object containing method and path
    */
   parseToolId(toolId) {
-    const [method, ...pathParts] = toolId.split("-");
-    const path = "/" + pathParts.join("/").replace(/-/g, "/");
-    return { method, path };
+    return parseToolId(toolId);
   }
   /**
    * Process query parameters for GET requests

package/dist/cli.js

@@ -14286,7 +14286,7 @@ var js_yaml_default = jsYaml;
 // src/openapi-loader.ts
 import crypto from "crypto";
 
-// src/abbreviations.ts
+// src/utils/abbreviations.ts
 var REVISED_COMMON_WORDS_TO_REMOVE = [
   "controller",
   "api",
@@ -14371,6 +14371,21 @@ var WORD_ABBREVIATIONS = {
   query: "Qry"
 };
 
+// src/utils/tool-id.ts
+function parseToolId(toolId) {
+  const [method, pathPart] = toolId.split("::", 2);
+  const path = pathPart ? "/" + pathPart.replace(/-/g, "/") : "";
+  return { method, path };
+}
+function sanitizeForToolId(input) {
+  return input.replace(/[^A-Za-z0-9_-]/g, "").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-");
+}
+function generateToolId(method, path) {
+  const cleanPath = path.replace(/^\//, "").replace(/\{([^}]+)\}/g, "$1").replace(/\//g, "-");
+  const sanitizedPath = sanitizeForToolId(cleanPath);
+  return `${method.toUpperCase()}::${sanitizedPath}`;
+}
+
 // src/openapi-loader.ts
 var OpenAPISpecLoader = class {
   /**
@@ -14562,9 +14577,8 @@ var OpenAPISpecLoader = class {
           continue;
         }
         const op = operation;
-        const cleanPath = path.replace(/^\//, "").replace(/\{([^}]+)\}/g, "$1");
-        const toolId = `${method.toUpperCase()}-${cleanPath}`.replace(/[^a-zA-Z0-9-]/g, "-");
-        let nameSource = op.operationId || op.summary || `${method.toUpperCase()} ${path}`;
+        const toolId = generateToolId(method, path);
+        const nameSource = op.operationId || op.summary || `${method.toUpperCase()} ${path}`;
         const name = this.abbreviateOperationId(nameSource);
         const tool = {
           name,
@@ -14574,6 +14588,7 @@ var OpenAPISpecLoader = class {
             properties: {}
           }
         };
+        tool["x-original-path"] = path;
         const requiredParams = [];
         if (op.parameters) {
           for (const param of op.parameters) {
@@ -14940,11 +14955,12 @@ var ToolsManager = class {
   }
   /**
    * Get the path and method from a tool ID
+   *
+   * Note: This converts hyphens back to slashes to reconstruct the original API path.
+   * This is consistent with ApiClient.parseToolId() which needs the actual path for HTTP requests.
    */
   parseToolId(toolId) {
-    const [method, ...pathParts] = toolId.split("-");
-    const path = "/" + pathParts.join("/").replace(/-/g, "/");
-    return { method, path };
+    return parseToolId(toolId);
   }
 };
 
@@ -18394,13 +18410,9 @@ var ApiClient = class {
       if (axios_default.isAxiosError(error)) {
         const axiosError = error;
         if (!isRetry && isAuthError(axiosError)) {
-          try {
-            const shouldRetry = await this.authProvider.handleAuthError(axiosError);
-            if (shouldRetry) {
-              return this.executeApiCallWithRetry(toolId, params, true);
-            }
-          } catch (authHandlerError) {
-            throw authHandlerError;
+          const shouldRetry = await this.authProvider.handleAuthError(axiosError);
+          if (shouldRetry) {
+            return this.executeApiCallWithRetry(toolId, params, true);
           }
         }
         throw new Error(
@@ -18413,13 +18425,11 @@ var ApiClient = class {
   /**
    * Parse a tool ID into HTTP method and path
    *
-   * @param toolId - Tool ID in format METHOD-path-parts
+   * @param toolId - Tool ID in format METHOD::pathPart
    * @returns Object containing method and path
    */
   parseToolId(toolId) {
-    const [method, ...pathParts] = toolId.split("-");
-    const path = "/" + pathParts.join("/").replace(/-/g, "/");
-    return { method, path };
+    return parseToolId(toolId);
   }
   /**
    * Process query parameters for GET requests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ivotoby/openapi-mcp-server",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "An MCP server that exposes OpenAPI endpoints as resources",
   "license": "MIT",
   "type": "module",
@@ -30,7 +30,8 @@
     "inspect-watch": "node ./scripts/inspect-watch.js",
     "start": "node bin/mcp-server.js",
     "test": "vitest run --config vitest.config.ts",
-    "test:watch": "vitest watch --config vitest.config.ts"
+    "test:watch": "vitest watch --config vitest.config.ts",
+    "test:coverage": "vitest run --coverage --config vitest.config.ts"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "1.11.1",
@@ -49,6 +50,7 @@
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
+    "@vitest/coverage-v8": "^3.1.3",
     "dotenv": "^16.4.7",
     "esbuild": "^0.25.1",
     "eslint": "^8.57.1",