@mcp-ts/sdk 1.3.6 → 1.3.9

package/src/server/storage/types.ts

@@ -1,116 +1,116 @@
-
-import type { MCPClient } from '../mcp/oauth-client.js';
-import type {
-    OAuthTokens,
-    OAuthClientInformationMixed,
-} from '@modelcontextprotocol/sdk/shared/auth.js';
-
-export interface SessionData {
-    sessionId: string;
-    serverId?: string; // Database server ID for mapping
-    serverName?: string;
-    serverUrl: string;
-    transportType: 'sse' | 'streamable_http';
-    callbackUrl: string;
-    createdAt: number;
-    identity: string;
-    headers?: Record<string, string>;
-    /**
-     * Session status marker used for TTL transitions:
-     * - false: short-lived intermediate/error/auth-pending session state
-     *          (keep this value when connection/auth is incomplete or failed)
-     * - true: active long-lived session state after successful connection/auth completion
-     */
-    active?: boolean;
-    // OAuth data (consolidated)
-    clientInformation?: OAuthClientInformationMixed;
-    tokens?: OAuthTokens;
-    codeVerifier?: string;
-    clientId?: string;
-}
-
-export interface SetClientOptions {
-    sessionId: string;
-    serverId?: string; // Database server ID
-    serverName?: string; // Human-readable server name
-    client?: MCPClient;
-    serverUrl?: string;
-    callbackUrl?: string;
-    transportType?: 'sse' | 'streamable_http';
-    identity?: string;
-    headers?: Record<string, string>;
-}
-
-/**
- * Interface for MCP Session Storage Backends
- */
-export interface StorageBackend {
-    /**
-     * Optional initialization (e.g., database connection)
-     */
-    init?(): Promise<void>;
-
-    /**
-     * Generates a unique session ID
-     */
-    generateSessionId(): string;
-
-    /**
-     * Stores or updates a session
-     */
-    /**
-     * Creates a new session. Throws if session already exists.
-     * @param session - Session data to create
-     * @param ttl - Optional TTL in seconds (defaults to backend's default)
-     */
-    createSession(session: SessionData, ttl?: number): Promise<void>;
-
-    /**
-     * Updates an existing session with partial data. Throws if session does not exist.
-     * @param identity - User identity
-     * @param sessionId - Session identifier
-     * @param data - Partial session data to update
-     * @param ttl - Optional TTL in seconds (defaults to backend's default)
-     */
-    updateSession(identity: string, sessionId: string, data: Partial<SessionData>, ttl?: number): Promise<void>;
-
-    /**
-     * Retrieves a session
-     */
-    getSession(identity: string, sessionId: string): Promise<SessionData | null>;
-
-    /**
-     * Gets full session data for all of an identity's sessions
-     */
-    getIdentitySessionsData(identity: string): Promise<SessionData[]>;
-
-    /**
-     * Removes a session
-     */
-    removeSession(identity: string, sessionId: string): Promise<void>;
-
-    /**
-     * Gets all sessions IDs of an identity
-     */
-    getIdentityMcpSessions(identity: string): Promise<string[]>;
-
-    /**
-     * Gets all session IDs across all users (Admin)
-     */
-    getAllSessionIds(): Promise<string[]>;
-
-    /**
-     * Clears all sessions (Admin)
-     */
-    clearAll(): Promise<void>;
-
-    /**
-     * Clean up expired sessions
-     */
-    cleanupExpiredSessions(): Promise<void>;
-
-    /**
-     * Disconnect from storage backend
-     */
-    disconnect(): Promise<void>;
-}
+
+import type { MCPClient } from '../mcp/oauth-client.js';
+import type {
+    OAuthTokens,
+    OAuthClientInformationMixed,
+} from '@modelcontextprotocol/sdk/shared/auth.js';
+
+export interface SessionData {
+    sessionId: string;
+    serverId?: string; // Database server ID for mapping
+    serverName?: string;
+    serverUrl: string;
+    transportType: 'sse' | 'streamable_http';
+    callbackUrl: string;
+    createdAt: number;
+    identity: string;
+    headers?: Record<string, string>;
+    /**
+     * Session status marker used for TTL transitions:
+     * - false: short-lived intermediate/error/auth-pending session state
+     *          (keep this value when connection/auth is incomplete or failed)
+     * - true: active long-lived session state after successful connection/auth completion
+     */
+    active?: boolean;
+    // OAuth data (consolidated)
+    clientInformation?: OAuthClientInformationMixed;
+    tokens?: OAuthTokens;
+    codeVerifier?: string;
+    clientId?: string;
+}
+
+export interface SetClientOptions {
+    sessionId: string;
+    serverId?: string; // Database server ID
+    serverName?: string; // Human-readable server name
+    client?: MCPClient;
+    serverUrl?: string;
+    callbackUrl?: string;
+    transportType?: 'sse' | 'streamable_http';
+    identity?: string;
+    headers?: Record<string, string>;
+}
+
+/**
+ * Interface for MCP Session Storage Backends
+ */
+export interface StorageBackend {
+    /**
+     * Optional initialization (e.g., database connection)
+     */
+    init?(): Promise<void>;
+
+    /**
+     * Generates a unique session ID
+     */
+    generateSessionId(): string;
+
+    /**
+     * Stores or updates a session
+     */
+    /**
+     * Creates a new session. Throws if session already exists.
+     * @param session - Session data to create
+     * @param ttl - Optional TTL in seconds (defaults to backend's default)
+     */
+    createSession(session: SessionData, ttl?: number): Promise<void>;
+
+    /**
+     * Updates an existing session with partial data. Throws if session does not exist.
+     * @param identity - User identity
+     * @param sessionId - Session identifier
+     * @param data - Partial session data to update
+     * @param ttl - Optional TTL in seconds (defaults to backend's default)
+     */
+    updateSession(identity: string, sessionId: string, data: Partial<SessionData>, ttl?: number): Promise<void>;
+
+    /**
+     * Retrieves a session
+     */
+    getSession(identity: string, sessionId: string): Promise<SessionData | null>;
+
+    /**
+     * Gets full session data for all of an identity's sessions
+     */
+    getIdentitySessionsData(identity: string): Promise<SessionData[]>;
+
+    /**
+     * Removes a session
+     */
+    removeSession(identity: string, sessionId: string): Promise<void>;
+
+    /**
+     * Gets all sessions IDs of an identity
+     */
+    getIdentityMcpSessions(identity: string): Promise<string[]>;
+
+    /**
+     * Gets all session IDs across all users (Admin)
+     */
+    getAllSessionIds(): Promise<string[]>;
+
+    /**
+     * Clears all sessions (Admin)
+     */
+    clearAll(): Promise<void>;
+
+    /**
+     * Clean up expired sessions
+     */
+    cleanupExpiredSessions(): Promise<void>;
+
+    /**
+     * Disconnect from storage backend
+     */
+    disconnect(): Promise<void>;
+}

package/src/shared/constants.ts

@@ -1,29 +1,29 @@
-/**
- * Centralized constants for MCP Redis library
- * Eliminates magic numbers and enables consistent configuration
- */
-
-// Redis TTL and Session Management
-export const SESSION_TTL_SECONDS = 43200; // 12 hours
-export const STATE_EXPIRATION_MS = 10 * 60 * 1000; // 10 minutes for OAuth state
-
-// Heartbeat and Connection
-export const DEFAULT_HEARTBEAT_INTERVAL_MS = 30000; // 30 seconds
-
-// Redis Key Prefixes
-export const REDIS_KEY_PREFIX = 'mcp:session:';
-
-// Token Management
-export const TOKEN_EXPIRY_BUFFER_MS = 5 * 60 * 1000; // 5 minute buffer before expiry
-
-// Client Information
-export const DEFAULT_CLIENT_NAME = 'MCP Assistant';
-export const DEFAULT_CLIENT_URI = 'https://mcp-assistant.in';
-export const DEFAULT_LOGO_URI = 'https://mcp-assistant.in/logo.svg';
-export const DEFAULT_POLICY_URI = 'https://mcp-assistant.in/privacy';
-export const SOFTWARE_ID = '@mcp-ts';
-export const SOFTWARE_VERSION = '1.3.4';
-
-// MCP Client Configuration
-export const MCP_CLIENT_NAME = 'mcp-ts-oauth-client';
-export const MCP_CLIENT_VERSION = '2.0';
+/**
+ * Centralized constants for MCP Redis library
+ * Eliminates magic numbers and enables consistent configuration
+ */
+
+// Redis TTL and Session Management
+export const SESSION_TTL_SECONDS = 43200; // 12 hours
+export const STATE_EXPIRATION_MS = 10 * 60 * 1000; // 10 minutes for OAuth state
+
+// Heartbeat and Connection
+export const DEFAULT_HEARTBEAT_INTERVAL_MS = 30000; // 30 seconds
+
+// Redis Key Prefixes
+export const REDIS_KEY_PREFIX = 'mcp:session:';
+
+// Token Management
+export const TOKEN_EXPIRY_BUFFER_MS = 5 * 60 * 1000; // 5 minute buffer before expiry
+
+// Client Information
+export const DEFAULT_CLIENT_NAME = 'MCP Assistant';
+export const DEFAULT_CLIENT_URI = 'https://mcp-assistant.in';
+export const DEFAULT_LOGO_URI = 'https://mcp-assistant.in/logo.svg';
+export const DEFAULT_POLICY_URI = 'https://mcp-assistant.in/privacy';
+export const SOFTWARE_ID = '@mcp-ts';
+export const SOFTWARE_VERSION = '1.3.4';
+
+// MCP Client Configuration
+export const MCP_CLIENT_NAME = 'mcp-ts-oauth-client';
+export const MCP_CLIENT_VERSION = '2.0';

package/src/shared/errors.ts

@@ -1,133 +1,133 @@
-/**
- * Standardized error classes for MCP Redis library
- * Provides consistent error handling across the codebase
- */
-
-/**
- * Base error class for all MCP-related errors
- */
-export class McpError extends Error {
-    constructor(
-        public readonly code: string,
-        message: string,
-        public readonly cause?: Error
-    ) {
-        super(message);
-        this.name = 'McpError';
-        // Maintain proper prototype chain for instanceof checks
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-
-    toJSON() {
-        return {
-            name: this.name,
-            code: this.code,
-            message: this.message,
-            ...(this.cause ? { cause: this.cause.message } : {}),
-        };
-    }
-}
-
-/**
- * Thrown when OAuth authorization is required
- */
-export class UnauthorizedError extends McpError {
-    constructor(message: string = 'OAuth authorization required', cause?: Error) {
-        super('UNAUTHORIZED', message, cause);
-        this.name = 'UnauthorizedError';
-    }
-}
-
-/**
- * Thrown when connection to MCP server fails
- */
-export class ConnectionError extends McpError {
-    constructor(message: string, cause?: Error) {
-        super('CONNECTION_ERROR', message, cause);
-        this.name = 'ConnectionError';
-    }
-}
-
-/**
- * Thrown when session is not found or expired
- */
-export class SessionNotFoundError extends McpError {
-    constructor(sessionId: string, cause?: Error) {
-        super('SESSION_NOT_FOUND', `Session not found: ${sessionId}`, cause);
-        this.name = 'SessionNotFoundError';
-    }
-}
-
-/**
- * Thrown when session validation fails
- */
-export class SessionValidationError extends McpError {
-    constructor(message: string, cause?: Error) {
-        super('SESSION_VALIDATION_ERROR', message, cause);
-        this.name = 'SessionValidationError';
-    }
-}
-
-/**
- * Thrown when authentication fails
- */
-export class AuthenticationError extends McpError {
-    constructor(message: string, cause?: Error) {
-        super('AUTH_ERROR', message, cause);
-        this.name = 'AuthenticationError';
-    }
-}
-
-/**
- * Thrown when OAuth state validation fails
- */
-export class InvalidStateError extends McpError {
-    constructor(message: string = 'Invalid OAuth state', cause?: Error) {
-        super('INVALID_STATE', message, cause);
-        this.name = 'InvalidStateError';
-    }
-}
-
-/**
- * Thrown when client is not connected
- */
-export class NotConnectedError extends McpError {
-    constructor(message: string = 'Not connected to server', cause?: Error) {
-        super('NOT_CONNECTED', message, cause);
-        this.name = 'NotConnectedError';
-    }
-}
-
-/**
- * Thrown when required configuration is missing
- */
-export class ConfigurationError extends McpError {
-    constructor(message: string, cause?: Error) {
-        super('CONFIGURATION_ERROR', message, cause);
-        this.name = 'ConfigurationError';
-    }
-}
-
-/**
- * Thrown when tool execution fails
- */
-export class ToolExecutionError extends McpError {
-    constructor(toolName: string, message: string, cause?: Error) {
-        super('TOOL_EXECUTION_ERROR', `Tool '${toolName}' failed: ${message}`, cause);
-        this.name = 'ToolExecutionError';
-    }
-}
-
-/**
- * RPC error codes for SSE communication
- */
-export const RpcErrorCodes = {
-    EXECUTION_ERROR: 'EXECUTION_ERROR',
-    MISSING_IDENTITY: 'MISSING_IDENTITY',
-    UNAUTHORIZED: 'UNAUTHORIZED',
-    NO_CONNECTION: 'NO_CONNECTION',
-    UNKNOWN_METHOD: 'UNKNOWN_METHOD',
-    INVALID_PARAMS: 'INVALID_PARAMS',
-} as const;
-
-export type RpcErrorCode = typeof RpcErrorCodes[keyof typeof RpcErrorCodes];
+/**
+ * Standardized error classes for MCP Redis library
+ * Provides consistent error handling across the codebase
+ */
+
+/**
+ * Base error class for all MCP-related errors
+ */
+export class McpError extends Error {
+    constructor(
+        public readonly code: string,
+        message: string,
+        public readonly cause?: Error
+    ) {
+        super(message);
+        this.name = 'McpError';
+        // Maintain proper prototype chain for instanceof checks
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+
+    toJSON() {
+        return {
+            name: this.name,
+            code: this.code,
+            message: this.message,
+            ...(this.cause ? { cause: this.cause.message } : {}),
+        };
+    }
+}
+
+/**
+ * Thrown when OAuth authorization is required
+ */
+export class UnauthorizedError extends McpError {
+    constructor(message: string = 'OAuth authorization required', cause?: Error) {
+        super('UNAUTHORIZED', message, cause);
+        this.name = 'UnauthorizedError';
+    }
+}
+
+/**
+ * Thrown when connection to MCP server fails
+ */
+export class ConnectionError extends McpError {
+    constructor(message: string, cause?: Error) {
+        super('CONNECTION_ERROR', message, cause);
+        this.name = 'ConnectionError';
+    }
+}
+
+/**
+ * Thrown when session is not found or expired
+ */
+export class SessionNotFoundError extends McpError {
+    constructor(sessionId: string, cause?: Error) {
+        super('SESSION_NOT_FOUND', `Session not found: ${sessionId}`, cause);
+        this.name = 'SessionNotFoundError';
+    }
+}
+
+/**
+ * Thrown when session validation fails
+ */
+export class SessionValidationError extends McpError {
+    constructor(message: string, cause?: Error) {
+        super('SESSION_VALIDATION_ERROR', message, cause);
+        this.name = 'SessionValidationError';
+    }
+}
+
+/**
+ * Thrown when authentication fails
+ */
+export class AuthenticationError extends McpError {
+    constructor(message: string, cause?: Error) {
+        super('AUTH_ERROR', message, cause);
+        this.name = 'AuthenticationError';
+    }
+}
+
+/**
+ * Thrown when OAuth state validation fails
+ */
+export class InvalidStateError extends McpError {
+    constructor(message: string = 'Invalid OAuth state', cause?: Error) {
+        super('INVALID_STATE', message, cause);
+        this.name = 'InvalidStateError';
+    }
+}
+
+/**
+ * Thrown when client is not connected
+ */
+export class NotConnectedError extends McpError {
+    constructor(message: string = 'Not connected to server', cause?: Error) {
+        super('NOT_CONNECTED', message, cause);
+        this.name = 'NotConnectedError';
+    }
+}
+
+/**
+ * Thrown when required configuration is missing
+ */
+export class ConfigurationError extends McpError {
+    constructor(message: string, cause?: Error) {
+        super('CONFIGURATION_ERROR', message, cause);
+        this.name = 'ConfigurationError';
+    }
+}
+
+/**
+ * Thrown when tool execution fails
+ */
+export class ToolExecutionError extends McpError {
+    constructor(toolName: string, message: string, cause?: Error) {
+        super('TOOL_EXECUTION_ERROR', `Tool '${toolName}' failed: ${message}`, cause);
+        this.name = 'ToolExecutionError';
+    }
+}
+
+/**
+ * RPC error codes for SSE communication
+ */
+export const RpcErrorCodes = {
+    EXECUTION_ERROR: 'EXECUTION_ERROR',
+    MISSING_IDENTITY: 'MISSING_IDENTITY',
+    UNAUTHORIZED: 'UNAUTHORIZED',
+    NO_CONNECTION: 'NO_CONNECTION',
+    UNKNOWN_METHOD: 'UNKNOWN_METHOD',
+    INVALID_PARAMS: 'INVALID_PARAMS',
+} as const;
+
+export type RpcErrorCode = typeof RpcErrorCodes[keyof typeof RpcErrorCodes];

package/src/shared/event-routing.ts

@@ -1,28 +1,28 @@
-import type { McpConnectionEvent, McpObservabilityEvent } from './events.js';
-import type { McpRpcResponse } from './types.js';
-
-export function isRpcResponseEvent(
-  event: McpConnectionEvent | McpObservabilityEvent | McpRpcResponse
-): event is McpRpcResponse {
-  return 'id' in event && ('result' in event || 'error' in event);
-}
-
-export function isConnectionEvent(
-  event: McpConnectionEvent | McpObservabilityEvent | McpRpcResponse
-): event is McpConnectionEvent {
-  if (!('type' in event)) {
-    return false;
-  }
-
-  switch (event.type) {
-    case 'state_changed':
-    case 'tools_discovered':
-    case 'auth_required':
-    case 'error':
-    case 'disconnected':
-    case 'progress':
-      return true;
-    default:
-      return false;
-  }
-}
+import type { McpConnectionEvent, McpObservabilityEvent } from './events.js';
+import type { McpRpcResponse } from './types.js';
+
+export function isRpcResponseEvent(
+  event: McpConnectionEvent | McpObservabilityEvent | McpRpcResponse
+): event is McpRpcResponse {
+  return 'id' in event && ('result' in event || 'error' in event);
+}
+
+export function isConnectionEvent(
+  event: McpConnectionEvent | McpObservabilityEvent | McpRpcResponse
+): event is McpConnectionEvent {
+  if (!('type' in event)) {
+    return false;
+  }
+
+  switch (event.type) {
+    case 'state_changed':
+    case 'tools_discovered':
+    case 'auth_required':
+    case 'error':
+    case 'disconnected':
+    case 'progress':
+      return true;
+    default:
+      return false;
+  }
+}