mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-19 00:48:08 +01:00
* feat: Implement reconnection staggering and backoff jitter for MCP connections
- Enhanced the reconnection logic in OAuthReconnectionManager to stagger reconnection attempts for multiple servers, reducing the risk of connection storms.
- Introduced a backoff delay with random jitter in MCPConnection to improve reconnection behavior during network issues.
- Updated the ConnectionsRepository to handle multiple server connections concurrently with a defined concurrency limit.
Added tests to ensure the new reconnection strategy works as intended.
* refactor: Update MCP server query configuration for improved data freshness
- Reduced stale time from 5 minutes to 30 seconds to ensure quicker updates on server initialization.
- Enabled refetching on window focus and mount to enhance data accuracy during user interactions.
* ♻️ refactor: On-demand MCP connections; remove proactive reconnection, default to available
- Remove reconnectServers() from refresh controller (connection storm root cause)
- Stop gating server selection on connection status; add to selection immediately
- Render agent panel tools from DB cache, not live connection status
- Proceed to cached tools on init failure (only gate on OAuth)
- Remove unused batchToggleServers()
- Reduce useMCPServersQuery staleTime from 5min to 30s, enable refetchOnMount/WindowFocus
* refactor: Optimize MCP tool initialization and server connection logic
- Adjusted tool initialization to only occur if no cached tools are available, improving efficiency.
- Updated comments for clarity on server connection and tool fetching processes.
- Removed unnecessary connection status checks during server selection to streamline the user experience.
143 lines
5.7 KiB
TypeScript
143 lines
5.7 KiB
TypeScript
import { logger } from '@librechat/data-schemas';
|
|
import { MCPConnectionFactory } from '~/mcp/MCPConnectionFactory';
|
|
import { MCPConnection } from './connection';
|
|
import { MCPServersRegistry } from '~/mcp/registry/MCPServersRegistry';
|
|
import type * as t from './types';
|
|
|
|
const CONNECT_CONCURRENCY = 3;
|
|
|
|
/**
|
|
* Manages MCP connections with lazy loading and reconnection.
|
|
* Maintains a pool of connections and handles connection lifecycle management.
|
|
* Queries server configurations dynamically from the MCPServersRegistry (single source of truth).
|
|
*
|
|
* Scope-aware: Each repository is tied to a specific owner scope:
|
|
* - ownerId = undefined → manages app-level servers only
|
|
* - ownerId = userId → manages user-level and private servers for that user
|
|
*/
|
|
export class ConnectionsRepository {
|
|
protected connections: Map<string, MCPConnection> = new Map();
|
|
protected oauthOpts: t.OAuthConnectionOptions | undefined;
|
|
private readonly ownerId: string | undefined;
|
|
|
|
constructor(ownerId?: string, oauthOpts?: t.OAuthConnectionOptions) {
|
|
this.ownerId = ownerId;
|
|
this.oauthOpts = oauthOpts;
|
|
}
|
|
|
|
/** Checks whether this repository can connect to a specific server */
|
|
async has(serverName: string): Promise<boolean> {
|
|
const config = await MCPServersRegistry.getInstance().getServerConfig(serverName, this.ownerId);
|
|
const canConnect = !!config && this.isAllowedToConnectToServer(config);
|
|
if (!canConnect) {
|
|
//if connection is no longer possible we attempt to disconnect any leftover connections
|
|
await this.disconnect(serverName);
|
|
}
|
|
return canConnect;
|
|
}
|
|
|
|
/** Gets or creates a connection for the specified server with lazy loading */
|
|
async get(serverName: string): Promise<MCPConnection | null> {
|
|
const serverConfig = await MCPServersRegistry.getInstance().getServerConfig(
|
|
serverName,
|
|
this.ownerId,
|
|
);
|
|
|
|
const existingConnection = this.connections.get(serverName);
|
|
if (!serverConfig || !this.isAllowedToConnectToServer(serverConfig)) {
|
|
if (existingConnection) {
|
|
await existingConnection.disconnect();
|
|
}
|
|
return null;
|
|
}
|
|
if (existingConnection) {
|
|
// Check if config was cached/updated since connection was created
|
|
if (serverConfig.updatedAt && existingConnection.isStale(serverConfig.updatedAt)) {
|
|
logger.info(
|
|
`${this.prefix(serverName)} Existing connection for ${serverName} is outdated. Recreating a new connection.`,
|
|
{
|
|
connectionCreated: new Date(existingConnection.createdAt).toISOString(),
|
|
configCachedAt: new Date(serverConfig.updatedAt).toISOString(),
|
|
},
|
|
);
|
|
|
|
// Disconnect stale connection
|
|
await existingConnection.disconnect();
|
|
this.connections.delete(serverName);
|
|
// Fall through to create new connection
|
|
} else if (await existingConnection.isConnected()) {
|
|
return existingConnection;
|
|
} else {
|
|
await this.disconnect(serverName);
|
|
}
|
|
}
|
|
const connection = await MCPConnectionFactory.create(
|
|
{
|
|
serverName,
|
|
serverConfig,
|
|
useSSRFProtection: MCPServersRegistry.getInstance().shouldEnableSSRFProtection(),
|
|
},
|
|
this.oauthOpts,
|
|
);
|
|
|
|
this.connections.set(serverName, connection);
|
|
return connection;
|
|
}
|
|
|
|
/** Gets or creates connections for multiple servers concurrently */
|
|
async getMany(serverNames: string[]): Promise<Map<string, MCPConnection>> {
|
|
const results: [string, MCPConnection | null][] = [];
|
|
for (let i = 0; i < serverNames.length; i += CONNECT_CONCURRENCY) {
|
|
const batch = serverNames.slice(i, i + CONNECT_CONCURRENCY);
|
|
const batchResults = await Promise.all(
|
|
batch.map(
|
|
async (name): Promise<[string, MCPConnection | null]> => [name, await this.get(name)],
|
|
),
|
|
);
|
|
results.push(...batchResults);
|
|
}
|
|
return new Map(results.filter((v): v is [string, MCPConnection] => v[1] != null));
|
|
}
|
|
|
|
/** Returns all currently loaded connections without creating new ones */
|
|
async getLoaded(): Promise<Map<string, MCPConnection>> {
|
|
return this.getMany(Array.from(this.connections.keys()));
|
|
}
|
|
|
|
/** Gets or creates connections for all configured servers in this repository's scope */
|
|
async getAll(): Promise<Map<string, MCPConnection>> {
|
|
//TODO in the future we should use a scoped config getter (APPLevel, UserLevel, Private)
|
|
//for now the absent config will not throw error
|
|
const allConfigs = await MCPServersRegistry.getInstance().getAllServerConfigs(this.ownerId);
|
|
return this.getMany(Object.keys(allConfigs));
|
|
}
|
|
|
|
/** Disconnects and removes a specific server connection from the pool */
|
|
async disconnect(serverName: string): Promise<void> {
|
|
const connection = this.connections.get(serverName);
|
|
if (!connection) return Promise.resolve();
|
|
this.connections.delete(serverName);
|
|
return connection.disconnect().catch((err) => {
|
|
logger.error(`${this.prefix(serverName)} Error disconnecting`, err);
|
|
});
|
|
}
|
|
|
|
/** Disconnects all active connections and returns array of disconnect promises */
|
|
disconnectAll(): Promise<void>[] {
|
|
const serverNames = Array.from(this.connections.keys());
|
|
return serverNames.map((serverName) => this.disconnect(serverName));
|
|
}
|
|
|
|
// Returns formatted log prefix for server messages
|
|
protected prefix(serverName: string): string {
|
|
return `[MCP][${serverName}]`;
|
|
}
|
|
|
|
private isAllowedToConnectToServer(config: t.ParsedServerConfig) {
|
|
//the repository is not allowed to be connected in case the Connection repository is shared (ownerId is undefined/null) and the server requires Auth or startup false.
|
|
if (this.ownerId === undefined && (config.startup === false || config.requiresOAuth)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
}
|