@lobehub/lobehub 2.0.0-next.126 → 2.0.0-next.128

package/packages/database/src/schemas/generation.ts

@@ -10,7 +10,7 @@ import { files } from './file';
 import { users } from './user';
 
 /**
- * 生成主题表 - 用于组织和管理 AI 生成内容的主题
+ * Generation topics table - Used to organize and manage AI-generated content topics
  */
 export const generationTopics = pgTable('generation_topics', {
   id: text('id')
@@ -22,10 +22,10 @@ export const generationTopics = pgTable('generation_topics', {
     .references(() => users.id, { onDelete: 'cascade' })
     .notNull(),
 
-  /** 简要描述主题内容，由 LLM 生成 */
+  /** Brief description of topic content, generated by LLM */
   title: text('title'),
 
-  /** 主题封面图片 URL */
+  /** Topic cover image URL */
   coverUrl: text('cover_url'),
 
   ...timestamps,
@@ -37,7 +37,7 @@ export type NewGenerationTopic = typeof generationTopics.$inferInsert;
 export type GenerationTopicItem = typeof generationTopics.$inferSelect;
 
 /**
- * 生成批次表 - 存储一次生成请求的配置信息
+ * Generation batches table - Stores configuration information for a single generation request
  */
 export const generationBatches = pgTable('generation_batches', {
   id: text('id')
@@ -53,25 +53,25 @@ export const generationBatches = pgTable('generation_batches', {
     .notNull()
     .references(() => generationTopics.id, { onDelete: 'cascade' }),
 
-  /** 服务商名称 */
+  /** Provider name */
   provider: text('provider').notNull(),
 
-  /** 模型名称 */
+  /** Model name */
   model: text('model').notNull(),
 
-  /** 生成提示词 */
+  /** Generation prompt */
   prompt: text('prompt').notNull(),
 
-  /** 图片宽度 */
+  /** Image width */
   width: integer('width'),
 
-  /** 图片高度 */
+  /** Image height */
   height: integer('height'),
 
-  /** 图片比例 */
+  /** Image aspect ratio */
   ratio: varchar('ratio', { length: 64 }),
 
-  /** 存储生成批次的配置，存放不需要建立索引的公共配置 */
+  /** Stores generation batch configuration for common settings that don't need indexing */
   config: jsonb('config'),
 
   ...timestamps,
@@ -86,7 +86,7 @@ export type GenerationBatchWithGenerations = GenerationBatchItem & {
 };
 
 /**
- *  存储单个 AI 生成信息
+ * Stores individual AI generation information
  */
 export const generations = pgTable('generations', {
   id: text('id')
@@ -102,18 +102,18 @@ export const generations = pgTable('generations', {
     .notNull()
     .references(() => generationBatches.id, { onDelete: 'cascade' }),
 
-  /** 关联的异步任务 ID */
+  /** Associated async task ID */
   asyncTaskId: uuid('async_task_id').references(() => asyncTasks.id, {
     onDelete: 'set null',
   }),
 
-  /** 关联的生成文件 ID，删除文件时连带删除生成记录 */
+  /** Associated generated file ID, deletes generation record when file is deleted */
   fileId: text('file_id').references(() => files.id, { onDelete: 'cascade' }),
 
-  /** 生成种子值 */
+  /** Generation seed value */
   seed: integer('seed'),
 
-  /** 生成的资源信息，包含存储在 s3 上的 key, 图片实际宽高，缩略图 key 等 */
+  /** Generated asset information, including S3 storage key, actual image dimensions, thumbnail key, etc. */
   asset: jsonb('asset').$type<ImageGenerationAsset>(),
 
   ...timestamps,

package/packages/database/src/schemas/oidc.ts

@@ -6,8 +6,8 @@ import { timestamps, timestamptz } from './_helpers';
 import { users } from './user';
 
 /**
- * OIDC 授权码
- * oidc-provider 需要持久化的模型之一
+ * OIDC authorization code
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcAuthorizationCodes = pgTable('oidc_authorization_codes', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -23,8 +23,8 @@ export const oidcAuthorizationCodes = pgTable('oidc_authorization_codes', {
 });
 
 /**
- * OIDC 访问令牌
- * oidc-provider 需要持久化的模型之一
+ * OIDC access token
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcAccessTokens = pgTable('oidc_access_tokens', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -40,8 +40,8 @@ export const oidcAccessTokens = pgTable('oidc_access_tokens', {
 });
 
 /**
- * OIDC 刷新令牌
- * oidc-provider 需要持久化的模型之一
+ * OIDC refresh token
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcRefreshTokens = pgTable('oidc_refresh_tokens', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -57,8 +57,8 @@ export const oidcRefreshTokens = pgTable('oidc_refresh_tokens', {
 });
 
 /**
- * OIDC 设备代码
- * oidc-provider 需要持久化的模型之一
+ * OIDC device code
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcDeviceCodes = pgTable('oidc_device_codes', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -73,8 +73,8 @@ export const oidcDeviceCodes = pgTable('oidc_device_codes', {
 });
 
 /**
- * OIDC 交互会话
- * oidc-provider 需要持久化的模型之一
+ * OIDC interaction session
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcInteractions = pgTable('oidc_interactions', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -84,8 +84,8 @@ export const oidcInteractions = pgTable('oidc_interactions', {
 });
 
 /**
- * OIDC 授权记录
- * oidc-provider 需要持久化的模型之一
+ * OIDC grant record
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcGrants = pgTable('oidc_grants', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -100,14 +100,14 @@ export const oidcGrants = pgTable('oidc_grants', {
 });
 
 /**
- * OIDC 客户端配置
- * 存储 OIDC 客户端配置信息
+ * OIDC client configuration
+ * Stores OIDC client configuration information
  */
 export const oidcClients = pgTable('oidc_clients', {
   id: varchar('id', { length: 255 }).primaryKey(), // client_id
   name: text('name').notNull(),
   description: text('description'),
-  clientSecret: varchar('client_secret', { length: 255 }), // 公共客户端可为 null
+  clientSecret: varchar('client_secret', { length: 255 }), // Can be null for public clients
   redirectUris: text('redirect_uris').array().notNull(),
   grants: text('grants').array().notNull(),
   responseTypes: text('response_types').array().notNull(),
@@ -123,8 +123,8 @@ export const oidcClients = pgTable('oidc_clients', {
 });
 
 /**
- * OIDC 会话
- * oidc-provider 需要持久化的模型之一
+ * OIDC session
+ * One of the models that oidc-provider needs to persist
  */
 export const oidcSessions = pgTable('oidc_sessions', {
   id: varchar('id', { length: 255 }).primaryKey(),
@@ -137,8 +137,8 @@ export const oidcSessions = pgTable('oidc_sessions', {
 });
 
 /**
- * OIDC 授权同意记录
- * 记录用户对客户端的授权同意历史
+ * OIDC authorization consent record
+ * Records user authorization consent history for clients
  */
 export const oidcConsents = pgTable(
   'oidc_consents',
@@ -159,39 +159,39 @@ export const oidcConsents = pgTable(
 );
 
 /**
- * 通用认证凭证传递表
- * 用于在不同客户端（桌面端、浏览器插件、移动端等）之间安全传递认证凭证
+ * Generic authentication credential handoff table
+ * Used to securely pass authentication credentials between different clients (desktop, browser extension, mobile, etc.)
  *
- * 工作流程:
- * 1. 客户端生成唯一的 handoff ID
- * 2. 将 handoff ID 作为参数附加到 OAuth redirect_uri
- * 3. 认证成功后，中间页将凭证存储到此表
- * 4. 客户端轮询此表获取凭证
- * 5. 成功获取后立即删除记录
+ * Workflow:
+ * 1. Client generates a unique handoff ID
+ * 2. Appends handoff ID as a parameter to OAuth redirect_uri
+ * 3. After successful authentication, intermediate page stores credentials in this table
+ * 4. Client polls this table to retrieve credentials
+ * 5. Record is immediately deleted after successful retrieval
  */
 export const oauthHandoffs = pgTable('oauth_handoffs', {
   /**
-   * 由客户端生成的一次性唯一标识符
-   * 用于客户端轮询时认领自己的凭证
+   * One-time unique identifier generated by the client
+   * Used for client polling to claim its own credentials
    */
   id: text('id').primaryKey(),
 
   /**
-   * 客户端类型标识
-   * 如: 'desktop', 'browser-extension', 'mobile-app' 等
+   * Client type identifier
+   * Examples: 'desktop', 'browser-extension', 'mobile-app', etc.
    */
   client: varchar('client', { length: 50 }).notNull(),
 
   /**
-   * 凭证数据的 JSON 载荷
-   * 灵活存储不同认证流程所需的各种数据
-   * 当前主要包含: { code: string; state: string }
+   * JSON payload for credential data
+   * Flexible storage for various data required by different authentication flows
+   * Currently mainly contains: { code: string; state: string }
    */
   payload: jsonb('payload').$type<Record<string, unknown>>().notNull(),
 
   /**
-   * 时间戳字段，用于 TTL 控制
-   * 凭证应在创建后 5 分钟内被消费，否则视为过期
+   * Timestamp fields for TTL control
+   * Credentials should be consumed within 5 minutes of creation, otherwise considered expired
    */
   ...timestamps,
 });

package/packages/model-runtime/src/providers/newapi/index.ts

@@ -25,6 +25,62 @@ export interface NewAPIPricing {
   supported_endpoint_types?: string[];
 }
 
+/**
+ * Detect if running in browser environment
+ */
+const isBrowser = () => typeof window !== 'undefined' && typeof document !== 'undefined';
+
+/**
+ * Parse a pricing API HTTP response into a `NewAPIPricing[] | null`.
+ * Shared between browser and server branches to avoid duplicated logic.
+ */
+const parsePricingResponse = async (res: Response): Promise<NewAPIPricing[] | null> => {
+  if (!res.ok) {
+    return null;
+  }
+
+  try {
+    const body = await res.json();
+    return body?.success && body?.data ? (body.data as NewAPIPricing[]) : null;
+  } catch {
+    return null;
+  }
+};
+
+/**
+ * Fetch pricing information with CORS bypass for client-side requests
+ * In browser environment, use /webapi/proxy to avoid CORS errors
+ */
+const fetchPricing = async (
+  pricingUrl: string,
+  apiKey: string,
+): Promise<NewAPIPricing[] | null> => {
+  try {
+    if (isBrowser()) {
+      // In browser environment, use the proxy endpoint to avoid CORS
+      // The proxy endpoint expects the URL as the request body
+      const proxyResponse = await fetch('/webapi/proxy', {
+        body: pricingUrl,
+        method: 'POST',
+      });
+
+      return await parsePricingResponse(proxyResponse);
+    } else {
+      // In server environment, fetch directly
+      const pricingResponse = await fetch(pricingUrl, {
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+      });
+
+      return await parsePricingResponse(pricingResponse);
+    }
+  } catch (error) {
+    console.debug('Failed to fetch NewAPI pricing info:', error);
+    return null;
+  }
+};
+
 export const params = {
   debug: {
     chatCompletion: () => process.env.DEBUG_NEWAPI_CHAT_COMPLETION === '1',
@@ -42,25 +98,12 @@ export const params = {
 
     // Try to get pricing information to enrich model details
     let pricingMap: Map<string, NewAPIPricing> = new Map();
-    try {
-      // Use saved baseURL
-      const pricingResponse = await fetch(`${baseURL}/api/pricing`, {
-        headers: {
-          Authorization: `Bearer ${openAIClient.apiKey}`,
-        },
-      });
 
-      if (pricingResponse.ok) {
-        const pricingData = await pricingResponse.json();
-        if (pricingData.success && pricingData.data) {
-          (pricingData.data as NewAPIPricing[]).forEach((pricing) => {
-            pricingMap.set(pricing.model_name, pricing);
-          });
-        }
-      }
-    } catch (error) {
-      // If fetching pricing information fails, continue using the basic model information
-      console.debug('Failed to fetch NewAPI pricing info:', error);
+    const pricingList = await fetchPricing(`${baseURL}/api/pricing`, openAIClient.apiKey || '');
+    if (pricingList) {
+      pricingList.forEach((pricing) => {
+        pricingMap.set(pricing.model_name, pricing);
+      });
     }
 
     // Process the model list: determine the provider for each model based on priority rules

package/packages/model-runtime/src/runtimeMap.ts

@@ -112,6 +112,7 @@ export const providerRuntimeMap = {
   ppio: LobePPIOAI,
   qiniu: LobeQiniuAI,
   qwen: LobeQwenAI,
+  router: LobeNewAPIAI,
   sambanova: LobeSambaNovaAI,
   search1api: LobeSearch1API,
   sensenova: LobeSenseNovaAI,

package/src/app/[variants]/(main)/settings/provider/features/ProviderConfig/UpdateProviderInfo/SettingModal.tsx

@@ -84,12 +84,16 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open, initial
     {
       children: (
         <Select
-          optionRender={({ label, value }) => (
-            <Flexbox align={'center'} gap={8} horizontal>
-              <ProviderIcon provider={value as string} size={18} />
-              {label}
-            </Flexbox>
-          )}
+          optionRender={({ label, value }) => {
+            // Map 'router' to 'newapi' for displaying the correct icon
+            const iconProvider = value === 'router' ? 'newapi' : (value as string);
+            return (
+              <Flexbox align={'center'} gap={8} horizontal>
+                <ProviderIcon provider={iconProvider} size={18} />
+                {label}
+              </Flexbox>
+            );
+          }}
           options={CUSTOM_PROVIDER_SDK_OPTIONS}
           placeholder={t('createNewAiProvider.sdkType.placeholder')}
           variant={'filled'}

package/src/envs/auth.test.ts

@@ -0,0 +1,60 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+import { getAuthConfig } from './auth';
+
+const ORIGINAL_ENV = { ...process.env };
+const ORIGINAL_WINDOW = globalThis.window;
+
+describe('getAuthConfig fallbacks', () => {
+  beforeEach(() => {
+    // reset env to a clean clone before each test
+    process.env = { ...ORIGINAL_ENV };
+    globalThis.window = ORIGINAL_WINDOW;
+  });
+
+  afterEach(() => {
+    process.env = { ...ORIGINAL_ENV };
+    globalThis.window = ORIGINAL_WINDOW;
+  });
+
+  it('should fall back to NEXT_AUTH_SSO_PROVIDERS when AUTH_SSO_PROVIDERS is empty string', () => {
+    process.env.AUTH_SSO_PROVIDERS = '';
+    process.env.NEXT_AUTH_SSO_PROVIDERS = 'logto,github';
+
+    // Simulate server runtime so @t3-oss/env treats this as server-side access
+    // (happy-dom sets window by default in Vitest)
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error - allow overriding for test
+    globalThis.window = undefined;
+
+    const config = getAuthConfig();
+
+    expect(config.AUTH_SSO_PROVIDERS).toBe('logto,github');
+  });
+
+  it('should fall back to NEXT_AUTH_SECRET when AUTH_SECRET is empty string', () => {
+    process.env.AUTH_SECRET = '';
+    process.env.NEXT_AUTH_SECRET = 'nextauth-secret';
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error - allow overriding for test
+    globalThis.window = undefined;
+
+    const config = getAuthConfig();
+
+    expect(config.AUTH_SECRET).toBe('nextauth-secret');
+  });
+
+  it('should fall back to NEXTAUTH_URL origin when NEXT_PUBLIC_AUTH_URL is empty string', () => {
+    process.env.NEXT_PUBLIC_AUTH_URL = '';
+    process.env.NEXTAUTH_URL = 'https://example.com/api/auth';
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error - allow overriding for test
+    globalThis.window = undefined;
+
+    const config = getAuthConfig();
+
+    expect(config.NEXT_PUBLIC_AUTH_URL).toBe('https://example.com');
+  });
+});

package/src/envs/auth.ts

@@ -237,14 +237,14 @@ export const getAuthConfig = () => {
       NEXT_PUBLIC_ENABLE_BETTER_AUTH: process.env.NEXT_PUBLIC_ENABLE_BETTER_AUTH === '1',
       // Fallback to NEXTAUTH_URL origin for seamless migration from next-auth
       NEXT_PUBLIC_AUTH_URL:
-        process.env.NEXT_PUBLIC_AUTH_URL ??
+        process.env.NEXT_PUBLIC_AUTH_URL ||
         (process.env.NEXTAUTH_URL ? new URL(process.env.NEXTAUTH_URL).origin : undefined),
       NEXT_PUBLIC_AUTH_EMAIL_VERIFICATION: process.env.NEXT_PUBLIC_AUTH_EMAIL_VERIFICATION === '1',
       NEXT_PUBLIC_ENABLE_MAGIC_LINK: process.env.NEXT_PUBLIC_ENABLE_MAGIC_LINK === '1',
       // Fallback to NEXT_AUTH_SECRET for seamless migration from next-auth
-      AUTH_SECRET: process.env.AUTH_SECRET ?? process.env.NEXT_AUTH_SECRET,
+      AUTH_SECRET: process.env.AUTH_SECRET || process.env.NEXT_AUTH_SECRET,
       // Fallback to NEXT_AUTH_SSO_PROVIDERS for seamless migration from next-auth
-      AUTH_SSO_PROVIDERS: process.env.AUTH_SSO_PROVIDERS ?? process.env.NEXT_AUTH_SSO_PROVIDERS,
+      AUTH_SSO_PROVIDERS: process.env.AUTH_SSO_PROVIDERS || process.env.NEXT_AUTH_SSO_PROVIDERS,
 
       // better-auth env for Cognito provider is different from next-auth's one
       AUTH_COGNITO_DOMAIN: process.env.AUTH_COGNITO_DOMAIN,

package/src/envs/redis.ts

@@ -0,0 +1,106 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix */
+import { createEnv } from '@t3-oss/env-nextjs';
+import { z } from 'zod';
+
+import type { RedisConfig } from '@/libs/redis';
+
+type UpstashRedisConfig = { token: string; url: string };
+
+const parseNumber = (value?: string) => {
+  const parsed = Number.parseInt(value ?? '', 10);
+
+  return Number.isInteger(parsed) ? parsed : undefined;
+};
+
+const parseRedisTls = (value?: string) => {
+  if (!value) {
+    return false
+  }
+
+  const normalized = value.trim().toLowerCase();
+  return normalized === 'true' || normalized === '1';
+};
+
+export const getRedisEnv = () => {
+  return createEnv({
+    runtimeEnv: {
+      REDIS_DATABASE: parseNumber(process.env.REDIS_DATABASE),
+      REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+      REDIS_PREFIX: process.env.REDIS_PREFIX || 'lobechat',
+      REDIS_TLS: parseRedisTls(process.env.REDIS_TLS),
+      REDIS_URL: process.env.REDIS_URL,
+      REDIS_USERNAME: process.env.REDIS_USERNAME,
+      UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN,
+      UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,
+    },
+    server: {
+      REDIS_DATABASE: z.number().int().optional(),
+      REDIS_PASSWORD: z.string().optional(),
+      REDIS_PREFIX: z.string(),
+      REDIS_TLS: z.boolean().default(false),
+      REDIS_URL: z.string().url().optional(),
+      REDIS_USERNAME: z.string().optional(),
+      UPSTASH_REDIS_REST_TOKEN: z.string().optional(),
+      UPSTASH_REDIS_REST_URL: z.string().url().optional(),
+    },
+  });
+};
+
+export const redisEnv = getRedisEnv();
+
+export const getUpstashRedisConfig = (): UpstashRedisConfig | null => {
+  const upstashConfigSchema = z.union([
+    z.object({
+      token: z.string(),
+      url: z.string().url(),
+    }),
+    z.object({
+      token: z.undefined().optional(),
+      url: z.undefined().optional(),
+    }),
+  ]);
+
+  const parsed = upstashConfigSchema.safeParse({
+    token: redisEnv.UPSTASH_REDIS_REST_TOKEN,
+    url: redisEnv.UPSTASH_REDIS_REST_URL,
+  });
+
+  if (!parsed.success) throw parsed.error;
+  if (!parsed.data.token || !parsed.data.url) return null;
+
+  return parsed.data;
+};
+
+export const getRedisConfig = (): RedisConfig => {
+  const prefix = redisEnv.REDIS_PREFIX;
+
+  if (redisEnv.REDIS_URL) {
+    return {
+      database: redisEnv.REDIS_DATABASE,
+      enabled: true,
+      password: redisEnv.REDIS_PASSWORD,
+      prefix,
+      provider: 'redis',
+      tls: redisEnv.REDIS_TLS,
+      url: redisEnv.REDIS_URL,
+      username: redisEnv.REDIS_USERNAME,
+    };
+  }
+
+  const upstashConfig = getUpstashRedisConfig();
+  if (upstashConfig) {
+    return {
+      enabled: true,
+      prefix,
+      provider: 'upstash',
+      token: upstashConfig.token,
+      url: upstashConfig.url,
+    };
+  }
+
+  return {
+    enabled: false,
+    prefix,
+    provider: false,
+  };
+};

package/src/libs/redis/index.ts

@@ -0,0 +1,5 @@
+export * from './manager';
+export * from './redis';
+export * from './types';
+export * from './upstash';
+export * from './utils';

package/src/libs/redis/manager.test.ts

@@ -0,0 +1,107 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { RedisManager, initializeRedis, resetRedisClient } from './manager';
+import { DisabledRedisConfig } from './types';
+
+const {
+  mockIoRedisInitialize,
+  mockIoRedisDisconnect,
+  mockUpstashInitialize,
+  mockUpstashDisconnect,
+} = vi.hoisted(() => ({
+  mockIoRedisInitialize: vi.fn().mockResolvedValue(undefined),
+  mockIoRedisDisconnect: vi.fn().mockResolvedValue(undefined),
+  mockUpstashInitialize: vi.fn().mockResolvedValue(undefined),
+  mockUpstashDisconnect: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock('./redis', () => {
+  const IoRedisRedisProvider = vi.fn().mockImplementation((config) => ({
+    provider: 'redis' as const,
+    config,
+    initialize: mockIoRedisInitialize,
+    disconnect: mockIoRedisDisconnect,
+  }));
+
+  return { IoRedisRedisProvider };
+});
+
+vi.mock('./upstash', () => {
+  const UpstashRedisProvider = vi.fn().mockImplementation((config) => ({
+    provider: 'upstash' as const,
+    config,
+    initialize: mockUpstashInitialize,
+    disconnect: mockUpstashDisconnect,
+  }));
+
+  return { UpstashRedisProvider };
+});
+
+afterEach(async () => {
+  vi.clearAllMocks();
+  await RedisManager.reset();
+});
+
+describe('RedisManager', () => {
+  it('returns null when redis is disabled', async () => {
+    const config = {
+      enabled: false,
+      prefix: 'test',
+      provider: false,
+    } satisfies DisabledRedisConfig;
+
+    const instance = await initializeRedis(config);
+
+    expect(instance).toBeNull();
+    expect(mockIoRedisInitialize).not.toHaveBeenCalled();
+    expect(mockUpstashInitialize).not.toHaveBeenCalled();
+  });
+
+  it('initializes ioredis provider once and memoizes the instance', async () => {
+    const config = {
+      database: 0,
+      enabled: true,
+      password: 'pwd',
+      prefix: 'test',
+      provider: 'redis' as const,
+      tls: false,
+      url: 'redis://localhost:6379',
+      username: 'user',
+    };
+    const [first, second] = await Promise.all([initializeRedis(config), initializeRedis(config)]);
+
+    expect(first).toBe(second);
+    expect(mockIoRedisInitialize).toHaveBeenCalledTimes(1);
+    expect(mockUpstashInitialize).not.toHaveBeenCalled();
+  });
+
+  it('initializes upstash provider when configured', async () => {
+    const config = {
+      enabled: true,
+      prefix: 'test',
+      provider: 'upstash' as const,
+      token: 'token',
+      url: 'https://example.upstash.io',
+    };
+    const instance = await initializeRedis(config);
+
+    expect(instance?.provider).toBe('upstash');
+    expect(mockUpstashInitialize).toHaveBeenCalledTimes(1);
+    expect(mockIoRedisInitialize).not.toHaveBeenCalled();
+  });
+
+  it('disconnects existing provider on reset', async () => {
+    const config = {
+      enabled: true,
+      prefix: 'test',
+      provider: 'redis' as const,
+      tls: false,
+      url: 'redis://localhost:6379',
+    };
+
+    await initializeRedis(config);
+    await resetRedisClient();
+
+    expect(mockIoRedisDisconnect).toHaveBeenCalledTimes(1);
+  });
+});