easy-mcp-nest 0.1.2 → 0.2.0

package/dist/tooling/tool-registry/tool-registry.service.d.ts

@@ -7,8 +7,9 @@ export interface LlmToolSchema {
         description: string;
         parameters: {
             type: "object";
-            properties: Record<string, ToolParameter>;
-            required: string[];
+            properties?: Record<string, ToolParameter>;
+            required?: string[];
+            [key: string]: any;
         };
     };
 }
@@ -16,8 +17,9 @@ export declare class ToolRegistryService {
     private readonly registry;
     registerTool(definition: ToolDefinition): void;
     getTool(name: string): ToolDefinition | undefined;
-    executeTool(name: string, args: Record<string, any>): Promise<any>;
+    executeTool(name: string, args: Record<string, any>, cancellationToken?: import("../tool.interface").CancellationToken): Promise<any>;
     registerToolFromConfig(toolInput: ToolRegistrationInput): void;
     getToolSchemasForLLM(): LlmToolSchema[];
+    private convertToolParameterToJsonSchema;
     getToolsAsRegistrationInput(): ToolRegistrationInput[];
 }

package/dist/tooling/tool-registry/tool-registry.service.js

@@ -10,6 +10,7 @@ exports.ToolRegistryService = void 0;
 const common_1 = require("@nestjs/common");
 const easy_mcp_error_1 = require("../../core/errors/easy-mcp-error");
 const logger_util_1 = require("../../core/utils/logger.util");
+const sanitize_util_1 = require("../../core/utils/sanitize.util");
 let ToolRegistryService = class ToolRegistryService {
     registry = new Map();
     registerTool(definition) {
@@ -25,13 +26,13 @@ let ToolRegistryService = class ToolRegistryService {
     getTool(name) {
         return this.registry.get(name);
     }
-    async executeTool(name, args) {
+    async executeTool(name, args, cancellationToken) {
         const tool = this.getTool(name);
         if (!tool) {
             throw new easy_mcp_error_1.ToolNotFoundError(name);
         }
         try {
-            const result = await tool.execute(args);
+            const result = await tool.execute(args, cancellationToken);
             return result;
         }
         catch (error) {
@@ -40,33 +41,20 @@ let ToolRegistryService = class ToolRegistryService {
         }
     }
     registerToolFromConfig(toolInput) {
-        const parameters = {};
-        for (const [key, prop] of Object.entries(toolInput.inputSchema.properties)) {
-            const typeMap = {
-                'STRING': 'string',
-                'NUMBER': 'number',
-                'INTEGER': 'integer',
-                'BOOLEAN': 'boolean',
-                'ARRAY': 'array',
-                'OBJECT': 'object',
-            };
-            const lowerType = typeMap[prop.type];
-            if (!lowerType) {
-                throw new Error(`Tool '${toolInput.name}': Unsupported property type '${prop.type}' for property '${key}'. Must be one of: STRING, NUMBER, INTEGER, BOOLEAN, ARRAY, OBJECT`);
-            }
-            parameters[key] = {
-                type: lowerType,
-                description: prop.description || '',
-                ...(prop.enum && { enum: prop.enum }),
-            };
+        if (toolInput.inputSchema.type !== "object") {
+            throw new Error(`Tool '${toolInput.name}': inputSchema.type must be "object" for tool definitions`);
         }
-        const required = toolInput.inputSchema.required || [];
         const toolDefinition = {
             name: toolInput.name,
             description: toolInput.description,
             execute: toolInput.function,
-            parameters,
-            required,
+            inputSchema: {
+                type: "object",
+                properties: toolInput.inputSchema.properties || {},
+                required: toolInput.inputSchema.required || [],
+                ...Object.fromEntries(Object.entries(toolInput.inputSchema).filter(([key]) => !["type", "properties", "required"].includes(key) && (0, sanitize_util_1.isSafeObjectKey)(key))),
+            },
+            icon: toolInput.icon,
         };
         this.registerTool(toolDefinition);
     }
@@ -76,41 +64,86 @@ let ToolRegistryService = class ToolRegistryService {
             function: {
                 name: tool.name,
                 description: tool.description,
-                parameters: {
-                    type: "object",
-                    properties: tool.parameters,
-                    required: tool.required,
-                },
+                parameters: tool.inputSchema,
             },
         }));
     }
+    convertToolParameterToJsonSchema(param) {
+        const schema = {
+            ...(param.type !== undefined && { type: param.type }),
+            ...(param.description && { description: param.description }),
+            ...(param.enum && { enum: param.enum }),
+            ...(param.default !== undefined && { default: param.default }),
+            ...(param.const !== undefined && { const: param.const }),
+            ...(param.$ref && { $ref: param.$ref }),
+            ...(param.oneOf && { oneOf: param.oneOf.map((p) => this.convertToolParameterToJsonSchema(p)) }),
+            ...(param.anyOf && { anyOf: param.anyOf.map((p) => this.convertToolParameterToJsonSchema(p)) }),
+            ...(param.allOf && { allOf: param.allOf.map((p) => this.convertToolParameterToJsonSchema(p)) }),
+        };
+        if (param.properties) {
+            schema.type = schema.type ?? "object";
+            schema.properties = {};
+            for (const [key, value] of Object.entries(param.properties)) {
+                if ((0, sanitize_util_1.isSafeObjectKey)(key)) {
+                    schema.properties[key] = this.convertToolParameterToJsonSchema(value);
+                }
+            }
+            if (Array.isArray(param.required)) {
+                schema.required = param.required;
+            }
+        }
+        if (param.items) {
+            schema.type = schema.type ?? "array";
+            schema.items = Array.isArray(param.items)
+                ? param.items.map((item) => this.convertToolParameterToJsonSchema(item))
+                : this.convertToolParameterToJsonSchema(param.items);
+        }
+        for (const [key, value] of Object.entries(param)) {
+            if (![
+                "type",
+                "description",
+                "enum",
+                "default",
+                "const",
+                "required",
+                "$ref",
+                "oneOf",
+                "anyOf",
+                "allOf",
+                "properties",
+                "items",
+            ].includes(key) &&
+                (0, sanitize_util_1.isSafeObjectKey)(key)) {
+                schema[key] = value;
+            }
+        }
+        return schema;
+    }
     getToolsAsRegistrationInput() {
         return Array.from(this.registry.values()).map((tool) => {
-            const properties = {};
-            for (const [key, param] of Object.entries(tool.parameters)) {
-                const typeMap = {
-                    'string': 'STRING',
-                    'number': 'NUMBER',
-                    'integer': 'INTEGER',
-                    'boolean': 'BOOLEAN',
-                    'array': 'ARRAY',
-                    'object': 'OBJECT',
-                };
-                properties[key] = {
-                    type: typeMap[param.type] || 'STRING',
-                    description: param.description,
-                    ...(param.enum && { enum: param.enum }),
-                };
+            const convertedSchema = {
+                type: "object",
+                ...(tool.inputSchema.required && { required: tool.inputSchema.required }),
+            };
+            if (tool.inputSchema.properties) {
+                convertedSchema.properties = {};
+                for (const [key, value] of Object.entries(tool.inputSchema.properties)) {
+                    if ((0, sanitize_util_1.isSafeObjectKey)(key)) {
+                        convertedSchema.properties[key] = this.convertToolParameterToJsonSchema(value);
+                    }
+                }
+            }
+            for (const [key, value] of Object.entries(tool.inputSchema)) {
+                if (!["type", "properties", "required"].includes(key) && (0, sanitize_util_1.isSafeObjectKey)(key)) {
+                    convertedSchema[key] = value;
+                }
             }
             return {
                 name: tool.name,
                 description: tool.description,
                 function: tool.execute,
-                inputSchema: {
-                    type: 'OBJECT',
-                    properties,
-                    required: tool.required,
-                },
+                inputSchema: convertedSchema,
+                icon: tool.icon,
             };
         });
     }

package/dist/tooling/tool-registry/tool-registry.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-registry.service.js","sourceRoot":"","sources":["../../../src/tooling/tool-registry/tool-registry.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-registry.service.js","sourceRoot":"","sources":["../../../src/tooling/tool-registry/tool-registry.service.ts"],"names":[],"mappings":"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"}

package/dist/tooling/tool.interface.d.ts

@@ -1,13 +1,33 @@
-export interface ToolParameter {
-    type: "string" | "number" | "integer" | "boolean" | "array" | "object";
-    description: string;
-    enum?: string[];
+export interface ToolParameter extends Record<string, any> {
+    type?: "string" | "number" | "integer" | "boolean" | "array" | "object";
+    description?: string;
+    enum?: (string | number | boolean)[];
+    default?: any;
+    const?: any;
+    items?: ToolParameter | ToolParameter[];
+    properties?: Record<string, ToolParameter>;
+    required?: string[];
+    oneOf?: ToolParameter[];
+    anyOf?: ToolParameter[];
+    allOf?: ToolParameter[];
+    $ref?: string;
+    [key: string]: any;
+}
+export interface CancellationToken {
+    isCancelled: boolean;
+    onCancel: (callback: () => void) => void;
+    cancel: () => void;
 }
-export type ToolFunction = (args: Record<string, any>) => Promise<any>;
+export type ToolFunction = (args: Record<string, any>, cancellationToken?: CancellationToken) => Promise<any>;
 export interface ToolDefinition {
     name: string;
     description: string;
     execute: ToolFunction;
-    parameters: Record<string, ToolParameter>;
-    required: string[];
+    inputSchema: {
+        type: "object";
+        properties?: Record<string, ToolParameter>;
+        required?: string[];
+        [key: string]: any;
+    };
+    icon?: string;
 }