@mastra/mcp 0.11.3-alpha.0 → 0.11.3-alpha.2

package/src/server/promptActions.ts

@@ -1,48 +0,0 @@
-import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
-import type { IMastraLogger } from '@mastra/core/logger';
-import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-
-interface ServerPromptActionsDependencies {
-  getLogger: () => IMastraLogger;
-  getSdkServer: () => Server;
-  clearDefinedPrompts: () => void;
-}
-
-export class ServerPromptActions {
-  private readonly getLogger: () => IMastraLogger;
-  private readonly getSdkServer: () => Server;
-  private readonly clearDefinedPrompts: () => void;
-
-  constructor(dependencies: ServerPromptActionsDependencies) {
-    this.getLogger = dependencies.getLogger;
-    this.getSdkServer = dependencies.getSdkServer;
-    this.clearDefinedPrompts = dependencies.clearDefinedPrompts;
-  }
-
-  /**
-   * Notifies the server that the overall list of available prompts has changed.
-   * This will clear the internal cache of defined prompts and send a list_changed notification to clients.
-   */
-  public async notifyListChanged(): Promise<void> {
-    this.getLogger().info('Prompt list change externally notified. Clearing definedPrompts and sending notification.');
-    this.clearDefinedPrompts();
-    try {
-      await this.getSdkServer().sendPromptListChanged();
-    } catch (error) {
-      const mastraError = new MastraError(
-        {
-          id: 'MCP_SERVER_PROMPT_LIST_CHANGED_NOTIFICATION_FAILED',
-          domain: ErrorDomain.MCP,
-          category: ErrorCategory.THIRD_PARTY,
-          text: 'Failed to send prompt list changed notification',
-        },
-        error,
-      );
-      this.getLogger().error('Failed to send prompt list changed notification:', {
-        error: mastraError.toString(),
-      });
-      this.getLogger().trackException(mastraError);
-      throw mastraError;
-    }
-  }
-}

package/src/server/resourceActions.ts

@@ -1,90 +0,0 @@
-import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
-import type { IMastraLogger } from '@mastra/core/logger';
-import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-
-interface ServerResourceActionsDependencies {
-  getSubscriptions: () => Set<string>;
-  getLogger: () => IMastraLogger;
-  getSdkServer: () => Server;
-  clearDefinedResources: () => void;
-  clearDefinedResourceTemplates: () => void;
-}
-
-export class ServerResourceActions {
-  private readonly getSubscriptions: () => Set<string>;
-  private readonly getLogger: () => IMastraLogger;
-  private readonly getSdkServer: () => Server;
-  private readonly clearDefinedResources: () => void;
-  private readonly clearDefinedResourceTemplates: () => void;
-
-  constructor(dependencies: ServerResourceActionsDependencies) {
-    this.getSubscriptions = dependencies.getSubscriptions;
-    this.getLogger = dependencies.getLogger;
-    this.getSdkServer = dependencies.getSdkServer;
-    this.clearDefinedResources = dependencies.clearDefinedResources;
-    this.clearDefinedResourceTemplates = dependencies.clearDefinedResourceTemplates;
-  }
-
-  /**
-   * Checks if any resources have been updated.
-   * If the resource is subscribed to by clients, an update notification will be sent.
-   */
-  public async notifyUpdated({ uri }: { uri: string }): Promise<void> {
-    if (this.getSubscriptions().has(uri)) {
-      this.getLogger().info(`Sending notifications/resources/updated for externally notified resource: ${uri}`);
-      try {
-        await this.getSdkServer().sendResourceUpdated({ uri });
-      } catch (error) {
-        const mastraError = new MastraError(
-          {
-            id: 'MCP_SERVER_RESOURCE_UPDATED_NOTIFICATION_FAILED',
-            domain: ErrorDomain.MCP,
-            category: ErrorCategory.THIRD_PARTY,
-            text: 'Failed to send resource updated notification',
-            details: {
-              uri,
-            },
-          },
-          error,
-        );
-        this.getLogger().trackException(mastraError);
-        this.getLogger().error('Failed to send resource updated notification:', {
-          error: mastraError.toString(),
-        });
-        throw mastraError;
-      }
-    } else {
-      this.getLogger().debug(`Resource ${uri} was updated, but no active subscriptions for it.`);
-    }
-  }
-
-  /**
-   * Notifies the server that the overall list of available resources has changed.
-   * This will clear the internal cache of defined resources and send a list_changed notification to clients.
-   */
-  public async notifyListChanged(): Promise<void> {
-    this.getLogger().info(
-      'Resource list change externally notified. Clearing definedResources and sending notification.',
-    );
-    this.clearDefinedResources(); // Clear cached resources
-    this.clearDefinedResourceTemplates(); // Clear cached resource templates
-    try {
-      await this.getSdkServer().sendResourceListChanged();
-    } catch (error) {
-      const mastraError = new MastraError(
-        {
-          id: 'MCP_SERVER_RESOURCE_LIST_CHANGED_NOTIFICATION_FAILED',
-          domain: ErrorDomain.MCP,
-          category: ErrorCategory.THIRD_PARTY,
-          text: 'Failed to send resource list changed notification',
-        },
-        error,
-      );
-      this.getLogger().trackException(mastraError);
-      this.getLogger().error('Failed to send resource list changed notification:', {
-        error: mastraError.toString(),
-      });
-      throw mastraError;
-    }
-  }
-}

package/src/server/server-logging.test.ts

@@ -1,181 +0,0 @@
-import { spawn } from 'child_process';
-import path from 'path';
-import { describe, it, expect, vi, beforeEach, afterEach, beforeAll, afterAll } from 'vitest';
-import type { LogMessage } from '../client/client';
-import { MCPClient } from '../client/configuration';
-
-// Increase test timeout for server operations
-vi.setConfig({ testTimeout: 80000, hookTimeout: 80000 });
-
-describe('MCP Server Logging', () => {
-  let consoleLogSpy: ReturnType<typeof vi.spyOn>;
-  let weatherProcess: ReturnType<typeof spawn>;
-  let weatherServerPort: number;
-  beforeAll(async () => {
-    weatherServerPort = 60000 + Math.floor(Math.random() * 1000); // Generate a random port
-
-    // Start the weather SSE server
-    weatherProcess = spawn('npx', ['-y', 'tsx', path.join(__dirname, '..', '__fixtures__/weather.ts')], {
-      env: { ...process.env, WEATHER_SERVER_PORT: String(weatherServerPort) },
-    });
-
-    // Wait for SSE server to be ready
-    let resolved = false;
-    await new Promise<void>((resolve, reject) => {
-      weatherProcess.on(`exit`, () => {
-        if (!resolved) reject();
-      });
-      if (weatherProcess.stderr) {
-        weatherProcess.stderr.on(`data`, chunk => {
-          console.error(chunk.toString());
-        });
-      }
-      if (weatherProcess.stdout) {
-        weatherProcess.stdout.on('data', chunk => {
-          if (chunk.toString().includes('server is running on SSE')) {
-            resolve();
-            resolved = true;
-          }
-        });
-      }
-    });
-  });
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-  });
-
-  afterEach(() => {
-    consoleLogSpy.mockRestore();
-    vi.clearAllMocks();
-  });
-
-  afterAll(async () => {
-    // Kill the weather SSE server
-    weatherProcess.kill('SIGINT');
-  });
-
-  it('should log events from specific servers to their handlers', async () => {
-    // Create individual log handlers for each server
-    const weatherLogHandler = vi.fn();
-    const stockLogHandler = vi.fn();
-
-    const config = new MCPClient({
-      id: 'server-log-test',
-      servers: {
-        weather: {
-          url: new URL(`http://localhost:${weatherServerPort}/sse`),
-          logger: weatherLogHandler,
-        },
-        stock: {
-          command: 'npx',
-          args: ['-y', 'tsx', path.join(__dirname, '..', '__fixtures__/stock-price.ts')],
-          env: {
-            FAKE_CREDS: 'test',
-          },
-          logger: stockLogHandler,
-        },
-      },
-    });
-
-    await config.getTools();
-
-    // Verify weather logs went to weather handler only
-    expect(weatherLogHandler).toHaveBeenCalled();
-
-    // Check logs contain server name
-    const weatherLogs = weatherLogHandler.mock.calls.map(call => call[0]);
-    weatherLogs.forEach(log => {
-      expect(log).toMatchObject({
-        serverName: 'weather',
-        timestamp: expect.any(Date),
-      });
-    });
-
-    // Verify stock logs went to stock handler only
-    expect(stockLogHandler).toHaveBeenCalled();
-
-    // Check logs contain server name
-    const stockLogs = stockLogHandler.mock.calls.map(call => call[0]);
-    stockLogs.forEach(log => {
-      expect(log).toMatchObject({
-        serverName: 'stock',
-        timestamp: expect.any(Date),
-      });
-    });
-
-    // Clean up
-    await config.disconnect();
-  });
-
-  it('should work with handlers that filter events by log level', async () => {
-    // Create a handler that only logs errors and critical/emergency messages
-    const errorCounter = { count: 0 };
-    const highSeverityHandler = vi.fn((logMessage: LogMessage) => {
-      if (['error', 'critical', 'alert', 'emergency'].includes(logMessage.level)) {
-        errorCounter.count++;
-      }
-    });
-
-    // Intentionally use a non-existent command to generate errors
-    const config = new MCPClient({
-      id: 'error-log-test',
-      servers: {
-        badServer: {
-          command: 'nonexistent-command-that-will-fail',
-          args: [],
-          logger: highSeverityHandler,
-        },
-      },
-    });
-
-    // This should fail, but our logger should capture the error
-    try {
-      await config.getTools();
-    } catch {
-      // Expected to fail
-    }
-
-    // Verify error logger was called
-    expect(highSeverityHandler).toHaveBeenCalled();
-
-    // Check we logged at least one error
-    expect(errorCounter.count).toBeGreaterThan(0);
-
-    // Clean up
-    await config.disconnect();
-  });
-
-  it('should support console logging patterns', async () => {
-    const logMessages: string[] = [];
-
-    const consoleLogger = (logMessage: LogMessage) => {
-      const formatted = `${logMessage.level}: ${logMessage.message}`;
-      logMessages.push(formatted);
-      console.log(formatted);
-    };
-
-    const config = new MCPClient({
-      id: 'console-log-test',
-      servers: {
-        echoServer: {
-          command: 'echo',
-          args: ['test'],
-          logger: consoleLogger,
-        },
-      },
-    });
-
-    try {
-      await config.getTools();
-    } catch {
-      // May fail, but we just care about logging
-    }
-
-    // Verify console.log was called
-    expect(consoleLogSpy).toHaveBeenCalled();
-
-    // Clean up
-    await config.disconnect();
-  });
-});