From 70e4239e526f072c21c8b8b677493f34dde676c0 Mon Sep 17 00:00:00 2001 From: FoxxMD Date: Tue, 28 Jul 2026 01:46:26 +0000 Subject: [PATCH] more cache config cleanup --- src/backend/common/Cache.ts | 29 +-------------------- src/backend/common/infrastructure/Atomic.ts | 4 +-- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/backend/common/Cache.ts b/src/backend/common/Cache.ts index b15acb5c..1d80e73e 100644 --- a/src/backend/common/Cache.ts +++ b/src/backend/common/Cache.ts @@ -40,14 +40,6 @@ typeson.register({ ] }); -const unsupportedEnvKeys = [ - 'CACHE_AUTH_CONN', - 'CACHE_METADATA', - 'CACHE_SCROBBLE', - 'CACHE_SCROBBLE_CONN', - 'CACHE_AUTH_CONN' -]; - export class MSCache { config: Required @@ -513,30 +505,11 @@ const noopKeyv: KeyvStoreAdapter = { export const parseUserConfig = (config: CacheConfigUser = {}, parentLogger: Logger = loggerNoop): CacheConfigOptions => { const logger = childLogger(parentLogger, 'Cache'); - let valkeyEnvVal: string | undefined = nonEmptyStringOrDefault(process.env.CACHE_VALKEY); - if(valkeyEnvVal === undefined) { - valkeyEnvVal = nonEmptyStringOrDefault(process.env.CACHE_METADATA_CONN); - if(valkeyEnvVal !== undefined) { - logger.warn('ENV CACHE_METADATA_CONN is deprecated! Replace it with CACHE_VALKEY'); - } - } - - for(const key of unsupportedEnvKeys) { - if(nonEmptyStringOrDefault(process.env[key]) !== undefined) { - logger.warn(`ENV ${key} is no longer supported. Refer to the Caching docs.`); - } - } - + const valkeyEnvVal: string | undefined = nonEmptyStringOrDefault(process.env.CACHE_VALKEY); const { valkey = valkeyEnvVal, - // metadata: { - // provider: mProvider = (process.env.CACHE_METADATA as (CacheMetadataProvider | undefined) ?? false), - // connection: mConn = process.env.CACHE_METADATA_CONN, - // //...restMetadata - // } = {}, auth: { provider: aProvider = (process.env.CACHE_AUTH as (CacheAuthProvider | undefined) ?? 'file'), - //...restAuth } = {} } = config; diff --git a/src/backend/common/infrastructure/Atomic.ts b/src/backend/common/infrastructure/Atomic.ts index ad1ef000..5f4aa35c 100644 --- a/src/backend/common/infrastructure/Atomic.ts +++ b/src/backend/common/infrastructure/Atomic.ts @@ -274,12 +274,12 @@ export interface CacheConfigOptions { } export const cacheConfigUserAuthSchema = z.object({ - provider: z.union([z.literal('valkey'), z.literal('file')]), + provider: z.enum(['valkey', 'file']), }).meta({description: 'The cache type to use for Auth'}); export const cacheConfigUserSchema = z.object({ auth: cacheConfigUserAuthSchema.optional(), - valkey: z.string().optional() + valkey: z.string().optional().meta({description: 'The connection string to a valkey server with the syntax `redis://HOST_IP:HOST_PORT`'}) }).meta({title: 'Cache Config', description: 'Configuration for Caching'}); export type CacheConfigUser = z.infer; -- 2.51.2