Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔒 fix: Prevent Race Condition in RedisJobStore (#11764)
Danny Avilae142ab72da7c
diff --git a/packages/api/src/cache/__tests__/cacheFactory/violationCache.cache_integration.spec.ts b/packages/api/src/cache/__tests__/cacheFactory/violationCache.cache_integration.spec.tsindex 989008e82e..1978620c24 100644--- a/packages/api/src/cache/__tests__/cacheFactory/violationCache.cache_integration.spec.ts+++ b/packages/api/src/cache/__tests__/cacheFactory/violationCache.cache_integration.spec.ts@@ -20,6 +20,24 @@ interface ViolationData {};}+/** Waits for both Redis clients (ioredis + keyv/node-redis) to be ready */+async function waitForRedisClients() {+ const redisClients = await import('../../redisClients');+ const { ioredisClient, keyvRedisClientReady } = redisClients;++ if (ioredisClient && ioredisClient.status !== 'ready') {+ await new Promise<void>((resolve) => {+ ioredisClient.once('ready', resolve);+ });+ }++ if (keyvRedisClientReady) {+ await keyvRedisClientReady;+ }++ return redisClients;+}+describe('violationCache', () => {let originalEnv: NodeJS.ProcessEnv;@@ -45,17 +63,9 @@ describe('violationCache', () => {test('should create violation cache with Redis when USE_REDIS is true', async () => {const cacheFactory = await import('../../cacheFactory');- const redisClients = await import('../../redisClients');- const { ioredisClient } = redisClients;+ await waitForRedisClients();const cache = cacheFactory.violationCache('test-violations', 60000); // 60 second TTL- // Wait for Redis connection to be ready- if (ioredisClient && ioredisClient.status !== 'ready') {- await new Promise<void>((resolve) => {- ioredisClient.once('ready', resolve);- });- }-// Verify it returns a Keyv instanceexpect(cache).toBeDefined();expect(cache.constructor.name).toBe('Keyv');@@ -112,18 +122,10 @@ describe('violationCache', () => {test('should respect namespace prefixing', async () => {const cacheFactory = await import('../../cacheFactory');- const redisClients = await import('../../redisClients');- const { ioredisClient } = redisClients;+ await waitForRedisClients();const cache1 = cacheFactory.violationCache('namespace1');const cache2 = cacheFactory.violationCache('namespace2');- // Wait for Redis connection to be ready- if (ioredisClient && ioredisClient.status !== 'ready') {- await new Promise<void>((resolve) => {- ioredisClient.once('ready', resolve);- });- }-const testKey = 'shared-key';const value1: ViolationData = { namespace: 1 };const value2: ViolationData = { namespace: 2 };@@ -146,18 +148,10 @@ describe('violationCache', () => {test('should respect TTL settings', async () => {const cacheFactory = await import('../../cacheFactory');- const redisClients = await import('../../redisClients');- const { ioredisClient } = redisClients;+ await waitForRedisClients();const ttl = 1000; // 1 second TTLconst cache = cacheFactory.violationCache('ttl-test', ttl);- // Wait for Redis connection to be ready- if (ioredisClient && ioredisClient.status !== 'ready') {- await new Promise<void>((resolve) => {- ioredisClient.once('ready', resolve);- });- }-const testKey = 'ttl-key';const testValue: ViolationData = { data: 'expires soon' };@@ -178,17 +172,9 @@ describe('violationCache', () => {test('should handle complex violation data structures', async () => {const cacheFactory = await import('../../cacheFactory');- const redisClients = await import('../../redisClients');- const { ioredisClient } = redisClients;+ await waitForRedisClients();const cache = cacheFactory.violationCache('complex-violations');- // Wait for Redis connection to be ready- if (ioredisClient && ioredisClient.status !== 'ready') {- await new Promise<void>((resolve) => {- ioredisClient.once('ready', resolve);- });- }-const complexData: ViolationData = {userId: 'user123',violations: [diff --git a/packages/api/src/stream/__tests__/RedisJobStore.stream_integration.spec.ts b/packages/api/src/stream/__tests__/RedisJobStore.stream_integration.spec.tsindex 89c6f9e92e..d00321a77d 100644--- a/packages/api/src/stream/__tests__/RedisJobStore.stream_integration.spec.ts+++ b/packages/api/src/stream/__tests__/RedisJobStore.stream_integration.spec.ts@@ -880,6 +880,67 @@ describe('RedisJobStore Integration Tests', () => {});});+ describe('Race Condition: updateJob after deleteJob', () => {+ test('should not re-create job hash when updateJob runs after deleteJob', async () => {+ if (!ioredisClient) {+ return;+ }++ const { RedisJobStore } = await import('../implementations/RedisJobStore');+ const store = new RedisJobStore(ioredisClient);+ await store.initialize();++ const streamId = `race-condition-${Date.now()}`;+ await store.createJob(streamId, 'user-1', streamId);++ const jobKey = `stream:{${streamId}}:job`;+ const ttlBefore = await ioredisClient.ttl(jobKey);+ expect(ttlBefore).toBeGreaterThan(0);++ await store.deleteJob(streamId);++ const afterDelete = await ioredisClient.exists(jobKey);+ expect(afterDelete).toBe(0);++ await store.updateJob(streamId, { finalEvent: JSON.stringify({ final: true }) });++ const afterUpdate = await ioredisClient.exists(jobKey);+ expect(afterUpdate).toBe(0);++ await store.destroy();+ });++ test('should not leave orphan keys from concurrent emitDone and deleteJob', async () => {+ if (!ioredisClient) {+ return;+ }++ const { RedisJobStore } = await import('../implementations/RedisJobStore');+ const store = new RedisJobStore(ioredisClient);+ await store.initialize();++ const streamId = `concurrent-race-${Date.now()}`;+ await store.createJob(streamId, 'user-1', streamId);++ const jobKey = `stream:{${streamId}}:job`;++ await Promise.all([+ store.updateJob(streamId, { finalEvent: JSON.stringify({ final: true }) }),+ store.deleteJob(streamId),+ ]);++ await new Promise((resolve) => setTimeout(resolve, 100));++ const exists = await ioredisClient.exists(jobKey);+ const ttl = exists ? await ioredisClient.ttl(jobKey) : -2;++ expect(ttl === -2 || ttl > 0).toBe(true);+ expect(ttl).not.toBe(-1);++ await store.destroy();+ });+ });+describe('Local Graph Cache Optimization', () => {test('should use local cache when available', async () => {if (!ioredisClient) {diff --git a/packages/api/src/stream/implementations/RedisJobStore.ts b/packages/api/src/stream/implementations/RedisJobStore.tsindex cce636d5a1..a0d26d087f 100644--- a/packages/api/src/stream/implementations/RedisJobStore.ts+++ b/packages/api/src/stream/implementations/RedisJobStore.ts@@ -156,13 +156,13 @@ export class RedisJobStore implements IJobStore {// For cluster mode, we can't pipeline keys on different slots// The job key uses hash tag {streamId}, runningJobs and userJobs are on different slotsif (this.isCluster) {- await this.redis.hmset(key, this.serializeJob(job));+ await this.redis.hset(key, this.serializeJob(job));await this.redis.expire(key, this.ttl.running);await this.redis.sadd(KEYS.runningJobs, streamId);await this.redis.sadd(userJobsKey, streamId);} else {const pipeline = this.redis.pipeline();- pipeline.hmset(key, this.serializeJob(job));+ pipeline.hset(key, this.serializeJob(job));pipeline.expire(key, this.ttl.running);pipeline.sadd(KEYS.runningJobs, streamId);pipeline.sadd(userJobsKey, streamId);@@ -183,17 +183,23 @@ export class RedisJobStore implements IJobStore {async updateJob(streamId: string, updates: Partial<SerializableJobData>): Promise<void> {const key = KEYS.job(streamId);- const exists = await this.redis.exists(key);- if (!exists) {- return;- }const serialized = this.serializeJob(updates as SerializableJobData);if (Object.keys(serialized).length === 0) {return;}- await this.redis.hmset(key, serialized);+ const fields = Object.entries(serialized).flat();+ const updated = await this.redis.eval(+ 'if redis.call("EXISTS", KEYS[1]) == 1 then redis.call("HSET", KEYS[1], unpack(ARGV)) return 1 else return 0 end',+ 1,+ key,+ ...fields,+ );++ if (updated === 0) {+ return;+ }// If status changed to complete/error/aborted, update TTL and remove from running set// Note: userJobs cleanup is handled lazily via self-healing in getActiveJobIdsByUser