mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-16 04:36:34 +01:00
* 🔌 fix: Resolve MCP OAuth flow state race condition The OAuth callback arrives before the flow state is stored because `createFlow()` returns a long-running Promise that only resolves on flow COMPLETION, not when the initial PENDING state is persisted. Calling it fire-and-forget with `.catch(() => {})` meant the redirect happened before the state existed, causing "Flow state not found" errors. Changes: - Add `initFlow()` to FlowStateManager that stores PENDING state and returns immediately, decoupling state persistence from monitoring - Await `initFlow()` before emitting the OAuth redirect so the callback always finds existing state - Keep `createFlow()` in the background for monitoring, but log warnings instead of silently swallowing errors - Increase FLOWS cache TTL from 3 minutes to 10 minutes to give users more time to complete OAuth consent screens Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 🔌 refactor: Revert FLOWS cache TTL change The race condition fix (initFlow) is sufficient on its own. TTL configurability should be a separate enhancement via librechat.yaml mcpSettings rather than a hardcoded increase. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 🔌 fix: Address PR review — restore FLOWS TTL, fix blocking-path race, clean up dead args - Restore FLOWS cache TTL to 10 minutes (was silently dropped back to 3) - Add initFlow before oauthStart in blocking handleOAuthRequired path to guarantee state persistence before any redirect - Pass {} to createFlow metadata arg (dead after initFlow writes state) - Downgrade background monitor .catch from logger.warn to logger.debug - Replace process.nextTick with Promise.resolve in test (correct semantics) - Add initFlow TTL assertion test - Add blocking-path ordering test (initFlow → oauthStart → createFlow) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
421 lines
12 KiB
TypeScript
421 lines
12 KiB
TypeScript
import { Keyv } from 'keyv';
|
|
import { logger } from '@librechat/data-schemas';
|
|
import type { StoredDataNoRaw } from 'keyv';
|
|
import type { FlowState, FlowMetadata, FlowManagerOptions } from './types';
|
|
|
|
export class FlowStateManager<T = unknown> {
|
|
private keyv: Keyv;
|
|
private ttl: number;
|
|
private intervals: Set<NodeJS.Timeout>;
|
|
|
|
constructor(store: Keyv, options?: FlowManagerOptions) {
|
|
if (!options) {
|
|
options = { ttl: 60000 * 3 };
|
|
}
|
|
const { ci = false, ttl } = options;
|
|
|
|
if (!ci && !(store instanceof Keyv)) {
|
|
throw new Error('Invalid store provided to FlowStateManager');
|
|
}
|
|
|
|
this.ttl = ttl;
|
|
this.keyv = store;
|
|
this.intervals = new Set();
|
|
|
|
if (!ci) {
|
|
this.setupCleanupHandlers();
|
|
}
|
|
}
|
|
|
|
private setupCleanupHandlers() {
|
|
const cleanup = () => {
|
|
logger.info('Cleaning up FlowStateManager intervals...');
|
|
this.intervals.forEach((interval) => clearInterval(interval));
|
|
this.intervals.clear();
|
|
process.exit(0);
|
|
};
|
|
|
|
process.on('SIGTERM', cleanup);
|
|
process.on('SIGINT', cleanup);
|
|
process.on('SIGQUIT', cleanup);
|
|
process.on('SIGHUP', cleanup);
|
|
}
|
|
|
|
private getFlowKey(flowId: string, type: string): string {
|
|
return `${type}:${flowId}`;
|
|
}
|
|
|
|
/**
|
|
* Normalizes an expiration timestamp to milliseconds.
|
|
* Detects whether the input is in seconds or milliseconds based on magnitude.
|
|
* Timestamps below 10 billion are assumed to be in seconds (valid until ~2286).
|
|
* @param timestamp - The expiration timestamp (in seconds or milliseconds)
|
|
* @returns The timestamp normalized to milliseconds
|
|
*/
|
|
private normalizeExpirationTimestamp(timestamp: number): number {
|
|
const SECONDS_THRESHOLD = 1e10;
|
|
if (timestamp < SECONDS_THRESHOLD) {
|
|
return timestamp * 1000;
|
|
}
|
|
return timestamp;
|
|
}
|
|
|
|
/**
|
|
* Checks if a flow's token has expired based on its expires_at field
|
|
* @param flowState - The flow state to check
|
|
* @returns true if the token has expired, false otherwise (including if no expires_at exists)
|
|
*/
|
|
private isTokenExpired(flowState: FlowState<T> | undefined): boolean {
|
|
if (!flowState?.result) {
|
|
return false;
|
|
}
|
|
|
|
if (typeof flowState.result !== 'object') {
|
|
return false;
|
|
}
|
|
|
|
if (!('expires_at' in flowState.result)) {
|
|
return false;
|
|
}
|
|
|
|
const expiresAt = (flowState.result as { expires_at: unknown }).expires_at;
|
|
|
|
if (typeof expiresAt !== 'number' || !Number.isFinite(expiresAt)) {
|
|
return false;
|
|
}
|
|
|
|
const normalizedExpiresAt = this.normalizeExpirationTimestamp(expiresAt);
|
|
return normalizedExpiresAt < Date.now();
|
|
}
|
|
|
|
/**
|
|
* Stores initial PENDING flow state without starting the monitor loop.
|
|
* Use this when you need to guarantee the state is persisted before
|
|
* performing an action (e.g., an OAuth redirect), then call createFlow()
|
|
* separately to start monitoring for completion.
|
|
*/
|
|
async initFlow(flowId: string, type: string, metadata: FlowMetadata = {}): Promise<void> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
const initialState: FlowState = {
|
|
type,
|
|
status: 'PENDING',
|
|
metadata,
|
|
createdAt: Date.now(),
|
|
};
|
|
logger.debug(`[${flowKey}] Storing initial flow state`);
|
|
await this.keyv.set(flowKey, initialState, this.ttl);
|
|
}
|
|
|
|
/**
|
|
* Creates a new flow and waits for its completion
|
|
*/
|
|
async createFlow(
|
|
flowId: string,
|
|
type: string,
|
|
metadata: FlowMetadata = {},
|
|
signal?: AbortSignal,
|
|
): Promise<T> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
|
|
let existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
if (existingState) {
|
|
logger.debug(`[${flowKey}] Flow already exists`);
|
|
return this.monitorFlow(flowKey, type, signal);
|
|
}
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
|
|
existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
if (existingState) {
|
|
logger.debug(`[${flowKey}] Flow exists on 2nd check`);
|
|
return this.monitorFlow(flowKey, type, signal);
|
|
}
|
|
|
|
const initialState: FlowState = {
|
|
type,
|
|
status: 'PENDING',
|
|
metadata,
|
|
createdAt: Date.now(),
|
|
};
|
|
|
|
logger.debug(`[${flowKey}] Creating initial flow state`);
|
|
await this.keyv.set(flowKey, initialState, this.ttl);
|
|
return this.monitorFlow(flowKey, type, signal);
|
|
}
|
|
|
|
private monitorFlow(flowKey: string, type: string, signal?: AbortSignal): Promise<T> {
|
|
return new Promise<T>((resolve, reject) => {
|
|
const checkInterval = 2000;
|
|
let elapsedTime = 0;
|
|
let isCleanedUp = false;
|
|
let intervalId: NodeJS.Timeout | null = null;
|
|
|
|
// Cleanup function to avoid duplicate cleanup
|
|
const cleanup = () => {
|
|
if (isCleanedUp) return;
|
|
isCleanedUp = true;
|
|
if (intervalId) {
|
|
clearInterval(intervalId);
|
|
this.intervals.delete(intervalId);
|
|
}
|
|
if (signal && abortHandler) {
|
|
signal.removeEventListener('abort', abortHandler);
|
|
}
|
|
};
|
|
|
|
// Immediate abort handler - responds instantly to abort signal
|
|
const abortHandler = async () => {
|
|
cleanup();
|
|
logger.warn(`[${flowKey}] Flow aborted (immediate)`);
|
|
const message = `${type} flow aborted`;
|
|
try {
|
|
await this.keyv.delete(flowKey);
|
|
} catch {
|
|
// Ignore delete errors during abort
|
|
}
|
|
reject(new Error(message));
|
|
};
|
|
|
|
// Register abort handler immediately if signal provided
|
|
if (signal) {
|
|
if (signal.aborted) {
|
|
// Already aborted, reject immediately
|
|
cleanup();
|
|
reject(new Error(`${type} flow aborted`));
|
|
return;
|
|
}
|
|
signal.addEventListener('abort', abortHandler, { once: true });
|
|
}
|
|
|
|
intervalId = setInterval(async () => {
|
|
if (isCleanedUp) return;
|
|
|
|
try {
|
|
const flowState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
|
|
if (!flowState) {
|
|
cleanup();
|
|
logger.error(`[${flowKey}] Flow state not found`);
|
|
reject(new Error(`${type} Flow state not found`));
|
|
return;
|
|
}
|
|
|
|
if (signal?.aborted) {
|
|
cleanup();
|
|
logger.warn(`[${flowKey}] Flow aborted`);
|
|
const message = `${type} flow aborted`;
|
|
await this.keyv.delete(flowKey);
|
|
reject(new Error(message));
|
|
return;
|
|
}
|
|
|
|
if (flowState.status !== 'PENDING') {
|
|
cleanup();
|
|
logger.debug(`[${flowKey}] Flow completed`);
|
|
|
|
if (flowState.status === 'COMPLETED' && flowState.result !== undefined) {
|
|
resolve(flowState.result);
|
|
} else if (flowState.status === 'FAILED') {
|
|
await this.keyv.delete(flowKey);
|
|
reject(new Error(flowState.error ?? `${type} flow failed`));
|
|
}
|
|
return;
|
|
}
|
|
|
|
elapsedTime += checkInterval;
|
|
if (elapsedTime >= this.ttl) {
|
|
cleanup();
|
|
logger.error(
|
|
`[${flowKey}] Flow timed out | Elapsed time: ${elapsedTime} | TTL: ${this.ttl}`,
|
|
);
|
|
await this.keyv.delete(flowKey);
|
|
reject(new Error(`${type} flow timed out`));
|
|
}
|
|
logger.debug(`[${flowKey}] Flow state elapsed time: ${elapsedTime}, checking again...`);
|
|
} catch (error) {
|
|
logger.error(`[${flowKey}] Error checking flow state:`, error);
|
|
cleanup();
|
|
reject(error);
|
|
}
|
|
}, checkInterval);
|
|
|
|
this.intervals.add(intervalId);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Completes a flow successfully
|
|
*/
|
|
async completeFlow(flowId: string, type: string, result: T): Promise<boolean> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
const flowState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
|
|
if (!flowState) {
|
|
logger.warn('[FlowStateManager] Cannot complete flow - flow state not found', {
|
|
flowId,
|
|
type,
|
|
});
|
|
return false;
|
|
}
|
|
|
|
/** Prevent duplicate completion */
|
|
if (flowState.status === 'COMPLETED') {
|
|
logger.debug(
|
|
'[FlowStateManager] Flow already completed, skipping to prevent duplicate completion',
|
|
{
|
|
flowId,
|
|
type,
|
|
},
|
|
);
|
|
return true;
|
|
}
|
|
|
|
const updatedState: FlowState<T> = {
|
|
...flowState,
|
|
status: 'COMPLETED',
|
|
result,
|
|
completedAt: Date.now(),
|
|
};
|
|
|
|
await this.keyv.set(flowKey, updatedState, this.ttl);
|
|
|
|
logger.debug('[FlowStateManager] Flow completed successfully', {
|
|
flowId,
|
|
type,
|
|
});
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Checks if a flow is stale based on its age and status
|
|
* @param flowId - The flow identifier
|
|
* @param type - The flow type
|
|
* @param staleThresholdMs - Age in milliseconds after which a non-pending flow is considered stale (default: 2 minutes)
|
|
* @returns Object with isStale boolean and age in milliseconds
|
|
*/
|
|
async isFlowStale(
|
|
flowId: string,
|
|
type: string,
|
|
staleThresholdMs: number = 2 * 60 * 1000,
|
|
): Promise<{ isStale: boolean; age: number; status?: string }> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
const flowState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
|
|
if (!flowState) {
|
|
return { isStale: false, age: 0 };
|
|
}
|
|
|
|
if (flowState.status === 'PENDING') {
|
|
return { isStale: false, age: 0, status: flowState.status };
|
|
}
|
|
|
|
const completedAt = flowState.completedAt || flowState.failedAt;
|
|
const createdAt = flowState.createdAt;
|
|
|
|
let flowAge = 0;
|
|
if (completedAt) {
|
|
flowAge = Date.now() - completedAt;
|
|
} else if (createdAt) {
|
|
flowAge = Date.now() - createdAt;
|
|
}
|
|
|
|
return {
|
|
isStale: flowAge > staleThresholdMs,
|
|
age: flowAge,
|
|
status: flowState.status,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Marks a flow as failed
|
|
*/
|
|
async failFlow(flowId: string, type: string, error: Error | string): Promise<boolean> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
const flowState = (await this.keyv.get(flowKey)) as FlowState | undefined;
|
|
|
|
if (!flowState) {
|
|
return false;
|
|
}
|
|
|
|
const updatedState: FlowState = {
|
|
...flowState,
|
|
status: 'FAILED',
|
|
error: error instanceof Error ? error.message : error,
|
|
failedAt: Date.now(),
|
|
};
|
|
|
|
await this.keyv.set(flowKey, updatedState, this.ttl);
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Gets current flow state
|
|
*/
|
|
async getFlowState(flowId: string, type: string): Promise<StoredDataNoRaw<FlowState<T>> | null> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
return this.keyv.get(flowKey);
|
|
}
|
|
|
|
/**
|
|
* Creates a new flow and waits for its completion, only executing the handler if no existing flow is found
|
|
* @param flowId - The ID of the flow
|
|
* @param type - The type of flow
|
|
* @param handler - Async function to execute if no existing flow is found
|
|
* @param signal - Optional AbortSignal to cancel the flow
|
|
*/
|
|
async createFlowWithHandler(
|
|
flowId: string,
|
|
type: string,
|
|
handler: () => Promise<T>,
|
|
signal?: AbortSignal,
|
|
): Promise<T> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
let existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
if (existingState && !this.isTokenExpired(existingState)) {
|
|
logger.debug(`[${flowKey}] Flow already exists with valid token`);
|
|
return this.monitorFlow(flowKey, type, signal);
|
|
}
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
|
|
existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
|
|
if (existingState && !this.isTokenExpired(existingState)) {
|
|
logger.debug(`[${flowKey}] Flow exists on 2nd check with valid token`);
|
|
return this.monitorFlow(flowKey, type, signal);
|
|
}
|
|
|
|
const initialState: FlowState = {
|
|
type,
|
|
status: 'PENDING',
|
|
metadata: {},
|
|
createdAt: Date.now(),
|
|
};
|
|
logger.debug(`[${flowKey}] Creating initial flow state`);
|
|
await this.keyv.set(flowKey, initialState, this.ttl);
|
|
|
|
try {
|
|
const result = await handler();
|
|
await this.completeFlow(flowId, type, result);
|
|
return result;
|
|
} catch (error) {
|
|
await this.failFlow(flowId, type, error instanceof Error ? error : new Error(String(error)));
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Deletes a flow state
|
|
*/
|
|
async deleteFlow(flowId: string, type: string): Promise<boolean> {
|
|
const flowKey = this.getFlowKey(flowId, type);
|
|
try {
|
|
await this.keyv.delete(flowKey);
|
|
logger.debug(`[${flowKey}] Flow deleted`);
|
|
return true;
|
|
} catch (error) {
|
|
logger.error(`[${flowKey}] Error deleting flow:`, error);
|
|
return false;
|
|
}
|
|
}
|
|
}
|