@rekog/mcp-nest 1.1.4 → 1.2.0

package/dist/services/mcp-tools.discovery.js

@@ -8,174 +8,113 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpToolsDiscovery = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
-const decorators_1 = require("../decorators");
 const zod_1 = require("zod");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
-const TextContentZodSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal("text"),
-    text: zod_1.z.string(),
-})
-    .strict();
-const ContentZodSchema = zod_1.z.discriminatedUnion("type", [
-    TextContentZodSchema,
-]);
-const ContentResultZodSchema = zod_1.z
-    .object({
-    content: ContentZodSchema.array(),
-    isError: zod_1.z.boolean().optional(),
-})
-    .strict();
+const mcp_tool_registry_service_1 = require("./mcp-tool-registry.service");
+const TextContentZodSchema = zod_1.z.object({ type: zod_1.z.literal("text"), text: zod_1.z.string() }).strict();
+const ImageContentZodSchema = zod_1.z.object({ type: zod_1.z.literal("image"), data: zod_1.z.string(), mimeType: zod_1.z.string() }).strict();
+const AudioContentZodSchema = zod_1.z.object({ type: zod_1.z.literal("audio"), data: zod_1.z.string(), mimeType: zod_1.z.string() }).strict();
+const ResourceZodSchema = zod_1.z.object({ uri: zod_1.z.string(), mimeType: zod_1.z.string().optional(), text: zod_1.z.string().optional(), blob: zod_1.z.string().optional(), name: zod_1.z.string().optional(), description: zod_1.z.string().optional(), size: zod_1.z.number().optional() }).refine(data => data.text !== undefined || data.blob !== undefined, { message: "Resource must have either text or blob content" });
+const EmbeddedResourceZodSchema = zod_1.z.object({ type: zod_1.z.literal("resource"), resource: ResourceZodSchema }).strict();
+const ContentZodSchema = zod_1.z.discriminatedUnion("type", [TextContentZodSchema, ImageContentZodSchema, AudioContentZodSchema, EmbeddedResourceZodSchema]);
+const ContentResultZodSchema = zod_1.z.object({ content: ContentZodSchema.array().min(1), isError: zod_1.z.boolean().optional() }).strict();
 class UserError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'UserError';
-    }
 }
 let McpToolsDiscovery = class McpToolsDiscovery {
-    constructor(discovery, metadataScanner) {
-        this.discovery = discovery;
-        this.metadataScanner = metadataScanner;
-        this.tools = [];
-    }
-    onApplicationBootstrap() {
-        this.collectTools();
+    constructor(registry, moduleRef, request) {
+        this.registry = registry;
+        this.moduleRef = moduleRef;
+        this.request = request;
     }
-    collectTools() {
-        const providers = this.discovery.getProviders();
-        const controllers = this.discovery.getControllers();
-        const allInstances = [...providers, ...controllers]
-            .filter((wrapper) => wrapper.instance)
-            .map((wrapper) => wrapper.instance);
-        allInstances.forEach((instance) => {
-            if (!instance || typeof instance !== 'object') {
-                return;
-            }
-            this.metadataScanner.getAllMethodNames(instance).forEach((methodName) => {
-                const methodRef = instance[methodName];
-                const methodMetaKeys = Reflect.getOwnMetadataKeys(methodRef);
-                if (!methodMetaKeys.includes(decorators_1.MCP_TOOL_METADATA_KEY)) {
-                    return;
-                }
-                const metadata = Reflect.getMetadata(decorators_1.MCP_TOOL_METADATA_KEY, methodRef);
-                this.tools.push({
-                    metadata,
-                    instance,
-                    methodName,
-                });
-            });
-        });
-    }
-    registerTools(mcpServer) {
+    registerRequestHandlers(mcpServer) {
+        const tools = this.registry.getTools();
         mcpServer.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async () => {
-            let tools = this.tools.map((tool) => ({
+            const toolList = tools.map((tool) => ({
                 name: tool.metadata.name,
                 description: tool.metadata.description,
                 inputSchema: tool.metadata.parameters
                     ? (0, zod_to_json_schema_1.zodToJsonSchema)(tool.metadata.parameters)
                     : undefined,
             }));
-            return {
-                tools
-            };
+            return { tools: toolList };
         });
-        mcpServer.server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
-            const tool = this.tools.find((tool) => tool.metadata.name === request.params.name);
-            if (!tool) {
-                throw new types_js_1.McpError(types_js_1.ErrorCode.MethodNotFound, `Unknown tool: ${request.params.name}`);
-            }
-            const schema = tool.metadata.parameters;
-            let parsedParams = request.params.arguments;
-            if (schema && schema instanceof zod_1.z.ZodType) {
-                const result = schema.safeParse(request.params.arguments);
-                if (!result.success) {
-                    throw new types_js_1.McpError(types_js_1.ErrorCode.InvalidParams, `Invalid ${request.params.name} parameters: ${JSON.stringify(result.error.format())}`);
-                }
-                parsedParams = result.data;
+        mcpServer.server.setRequestHandler(types_js_1.CallToolRequestSchema, async (callRequest, baseContext) => {
+            const toolInfo = this.registry.findTool(callRequest.params.name);
+            if (!toolInfo) {
+                throw new types_js_1.McpError(types_js_1.ErrorCode.MethodNotFound, `Unknown tool: ${callRequest.params.name}`);
             }
-            const progressToken = request.params?._meta?.progressToken;
+            const schema = toolInfo.metadata.parameters;
+            let parsedParams = callRequest.params.arguments;
+            let toolExecutionResult;
             try {
-                const context = this.createContext(mcpServer, progressToken);
-                const result = await tool.instance[tool.methodName].call(tool.instance, parsedParams, context);
-                if (typeof result === "string") {
-                    return ContentResultZodSchema.parse({
-                        content: [{ type: "text", text: result }],
-                    });
+                const executionContext = this.createExecutionContext(mcpServer, callRequest.params?._meta?.progressToken, baseContext);
+                const toolInstance = await this.moduleRef.resolve(toolInfo.providerClass, undefined, { strict: false });
+                if (!toolInstance) {
+                    throw new Error(`Failed to resolve instance for tool provider: ${toolInfo.providerClass.name}`);
                 }
-                else if (result && typeof result === "object" && "type" in result) {
-                    return ContentResultZodSchema.parse({
-                        content: [result],
-                    });
+                const resultFromMethod = await toolInstance[toolInfo.methodName].call(toolInstance, parsedParams, executionContext);
+                if (typeof resultFromMethod === "string") {
+                    toolExecutionResult = { content: [{ type: "text", text: resultFromMethod }] };
                 }
                 else {
-                    return ContentResultZodSchema.parse(result);
+                    const validation = ContentResultZodSchema.safeParse(resultFromMethod);
+                    if (!validation.success) {
+                        console.error(`Invalid result structure from tool ${toolInfo.metadata.name}:`, validation.error.format());
+                        executionContext.log.error(`Invalid result structure from tool ${toolInfo.metadata.name}`, { error: validation.error.format() });
+                        throw new Error(`Tool ${toolInfo.metadata.name} returned an invalid result structure.`);
+                    }
+                    toolExecutionResult = validation.data;
                 }
             }
             catch (error) {
-                if (error instanceof UserError) {
-                    return {
-                        content: [{ type: "text", text: error.message }],
-                        isError: true,
-                    };
+                const executionContextForLog = this.createExecutionContext(mcpServer, undefined, baseContext);
+                executionContextForLog.log.error(`Tool execution failed: ${toolInfo.metadata.name}`, { error: error.message });
+                if (error instanceof UserError || error instanceof types_js_1.McpError) {
+                    toolExecutionResult = { content: [{ type: "text", text: error.message }], isError: true };
+                }
+                else {
+                    toolExecutionResult = { content: [{ type: "text", text: "An internal error occurred." }], isError: true };
                 }
-                return {
-                    content: [{ type: "text", text: `Error: ${error}` }],
-                    isError: true,
-                };
             }
+            return { result: toolExecutionResult };
         });
     }
-    createContext(mcpServer, progressToken) {
+    createExecutionContext(mcpServer, progressToken, baseContext) {
+        const user = this.request.user;
         return {
+            user: user,
             reportProgress: async (progress) => {
-                if (progressToken) {
-                    await mcpServer.server.notification({
-                        method: "notifications/progress",
-                        params: {
-                            ...progress,
-                            progressToken,
-                        },
-                    });
+                if (progressToken !== undefined) {
+                    try {
+                        await mcpServer.server.notification({ method: "notifications/progress", params: { ...progress, progressToken } });
+                    }
+                    catch (e) {
+                        console.error("Failed to send progress notification:", e);
+                    }
                 }
             },
             log: {
-                debug: (message, context) => {
-                    mcpServer.server.sendLoggingMessage({
-                        level: "debug",
-                        data: { message, context },
-                    });
-                },
-                error: (message, context) => {
-                    mcpServer.server.sendLoggingMessage({
-                        level: "error",
-                        data: { message, context },
-                    });
-                },
-                info: (message, context) => {
-                    mcpServer.server.sendLoggingMessage({
-                        level: "info",
-                        data: { message, context },
-                    });
-                },
-                warn: (message, context) => {
-                    mcpServer.server.sendLoggingMessage({
-                        level: "warning",
-                        data: { message, context },
-                    });
-                },
+                debug: (message, context) => { mcpServer.server.sendLoggingMessage({ level: "debug", data: { message, context, user: user?.userId } }); },
+                error: (message, context) => { mcpServer.server.sendLoggingMessage({ level: "error", data: { message, context, user: user?.userId } }); },
+                info: (message, context) => { mcpServer.server.sendLoggingMessage({ level: "info", data: { message, context, user: user?.userId } }); },
+                warn: (message, context) => { mcpServer.server.sendLoggingMessage({ level: "warning", data: { message, context, user: user?.userId } }); },
             },
         };
     }
 };
 exports.McpToolsDiscovery = McpToolsDiscovery;
 exports.McpToolsDiscovery = McpToolsDiscovery = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.DiscoveryService,
-        core_1.MetadataScanner])
+    (0, common_1.Injectable)({ scope: common_1.Scope.REQUEST }),
+    __param(2, (0, common_1.Inject)(core_1.REQUEST)),
+    __metadata("design:paramtypes", [mcp_tool_registry_service_1.McpToolRegistryService,
+        core_1.ModuleRef, Object])
 ], McpToolsDiscovery);
 //# sourceMappingURL=mcp-tools.discovery.js.map

package/dist/services/mcp-tools.discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tools.discovery.js","sourceRoot":"","sources":["../../src/services/mcp-tools.discovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-tools.discovery.js","sourceRoot":"","sources":["../../src/services/mcp-tools.discovery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rekog/mcp-nest",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "NestJS module for creating Model Context Protocol (MCP) servers and exposing tools using SSE",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/mcp-auth.e2e.spec.ts

@@ -0,0 +1,231 @@
+import { INestApplication, Injectable } from "@nestjs/common";
+import { Test, TestingModule } from "@nestjs/testing";
+import { z } from "zod";
+import { Context, Tool } from "../src";
+import { McpModule } from "../src/mcp.module";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { Progress } from "@modelcontextprotocol/sdk/types.js";
+import { CanActivate, ExecutionContext } from "@nestjs/common";
+
+// Mock authentication guard
+class MockAuthGuard implements CanActivate {
+  canActivate(context: ExecutionContext): boolean {
+    const request = context.switchToHttp().getRequest();
+
+
+    if (request.headers.authorization && request.headers.authorization.includes("token-xyz")) {
+      request.user = {
+        id: "user123",
+        name: "Test User",
+        orgMemberships: [
+          {
+            orgId: "org123",
+            organization: {
+              name: "Auth Test Org",
+            },
+          },
+        ],
+      };
+
+      return true;
+    }
+    return false;
+  }
+}
+
+// Mock user repository
+@Injectable()
+class MockUserRepository {
+  async findOne() {
+    return {
+      id: "userRepo123",
+      name: "Repository User",
+      orgMemberships: [
+        {
+          orgId: "org123",
+          organization: {
+            name: "Repository Org",
+          },
+        },
+      ],
+    };
+  }
+}
+
+// Greeting tool that uses the authentication context
+@Injectable()
+export class AuthGreetingTool {
+  constructor(private readonly userRepository: MockUserRepository) {}
+
+  @Tool({
+    name: "auth-hello-world",
+    description: "A sample tool that accesses the authenticated user",
+    parameters: z.object({
+      name: z.string().default("World"),
+    }),
+  })
+  async sayHello({ name }, context: Context, request: Request & { user: any }) {
+    // Access both repository data and the authenticated user context
+    const repoUser = await this.userRepository.findOne();
+    const authUser = request.user; // Authenticated user from the request
+
+    // Construct greeting using both data sources
+    const greeting = `Hello, ${name}! I'm ${authUser.name} from ${
+      authUser.orgMemberships[0].organization.name
+    }. Repository user is ${repoUser.name}.`;
+
+    // Report progress for demonstration
+    for (let i = 0; i < 5; i++) {
+      await new Promise((resolve) => setTimeout(resolve, 200));
+      await context.reportProgress({
+        progress: (i+1) * 20,
+        total: 100,
+      } as Progress);
+    }
+
+    return {
+      content: [
+        {
+          type: "text",
+          text: greeting,
+        },
+      ],
+    };
+  }
+}
+
+describe("E2E: MCP Server with Authentication", () => {
+  let app: INestApplication;
+  let testPort: number;
+
+  beforeAll(async () => {
+    const moduleFixture: TestingModule = await Test.createTestingModule({
+      imports: [
+        McpModule.forRoot({
+          name: "test-auth-mcp-server",
+          version: "0.0.1",
+          // Specify the MockAuthGuard to protect the messages endpoint
+          guards: [MockAuthGuard],
+          capabilities: {
+            tools: {
+              "auth-hello-world": {
+                description: "A sample tool that accesses the authenticated user",
+                input: {
+                  name: {
+                    type: "string",
+                    default: "World",
+                  },
+                },
+              },
+            },
+          },
+        }),
+      ],
+      providers: [AuthGreetingTool, MockUserRepository, MockAuthGuard],
+    }).compile();
+
+    app = moduleFixture.createNestApplication();
+    await app.listen(0);
+
+    const server = app.getHttpServer();
+    testPort = server.address().port;
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+
+  it("should list tools", async () => {
+    const client = new Client(
+      { name: "example-client", version: "1.0.0" },
+      { capabilities: {} },
+    );
+    const sseUrl = new URL(`http://localhost:${testPort}/sse`);
+    const transport = new SSEClientTransport(sseUrl, {
+      requestInit: {
+        headers: {
+          Authorization: 'Bearer token-xyz'
+        }
+      }
+    });
+    await client.connect(transport);
+    const tools = await client.listTools();
+
+    // Verify that the authenticated tool is available
+    expect(tools.tools.length).toBeGreaterThan(0);
+    expect(tools.tools.find((t) => t.name === "auth-hello-world")).toBeDefined();
+
+    await client.close();
+  });
+
+  it('should inject authentication context into the tool', async () => {
+    const client = new Client(
+      { name: "example-client", version: "1.0.0" },
+      { capabilities: {} },
+    );
+    const sseUrl = new URL(`http://localhost:${testPort}/sse`);
+    const transport = new SSEClientTransport(sseUrl, {
+      requestInit: {
+        headers: {
+          Authorization: 'Bearer token-xyz'
+        }
+      }
+    });
+    await client.connect(transport);
+
+    let progressCount = 0;
+    const result: any = await client.callTool(
+      {
+        name: "auth-hello-world",
+        arguments: { name: "Authenticated User" },
+      },
+      undefined,
+      {
+        onprogress: (progress) => {
+          progressCount++;
+        },
+      },
+    );
+
+    // Verify that progress notifications were received
+    expect(progressCount).toBeGreaterThan(0);
+
+    // Verify that authentication context was available to the tool
+    expect(result.content[0].type).toBe("text");
+    expect(result.content[0].text).toContain("Auth Test Org");
+    expect(result.content[0].text).toContain("Test User");
+    expect(result.content[0].text).toContain("Repository user is Repository User");
+
+    await client.close();
+  });
+
+  it('should reject unauthenticated connections', async () => {
+    const client = new Client(
+      { name: "example-client", version: "1.0.0" },
+      { capabilities: {} },
+    );
+    const sseUrl = new URL(`http://localhost:${testPort}/sse`);
+
+    // Using invalid token
+    const transport = new SSEClientTransport(sseUrl, {
+      requestInit: {
+        headers: {
+          Authorization: 'Bearer invalid-token'
+        }
+      }
+    });
+
+    // Connection should be rejected
+    try {
+      await client.connect(transport);
+      // If we get here, the test should fail
+      fail('Connection should have been rejected');
+    } catch (error) {
+      // We expect an error to be thrown when authentication fails
+      expect(error).toBeDefined();
+    } finally {
+      await client.close();
+    }
+  });
+});