Suffix with -Type

packages/cli/src/services/redis/RedisServiceBaseClasses.ts

@@ -4,7 +4,7 @@ import { Service } from 'typedi';
 import config from '@/config';
 import { Logger } from '@/Logger';
 import { RedisClientService } from './redis-client.service';
-import type { RedisClient } from './redis.types';
+import type { RedisClientType } from './redis.types';
 
 export type RedisServiceMessageHandler =
 	| ((channel: string, message: string) => void)
@@ -21,7 +21,7 @@ class RedisServiceBase {
 		private readonly redisClientService: RedisClientService,
 	) {}
 
-	async init(type: RedisClient): Promise<void> {
+	async init(type: RedisClientType): Promise<void> {
 		if (this.redisClient && this.isInitialized) {
 			return;
 		}
@@ -49,7 +49,7 @@ class RedisServiceBase {
 export abstract class RedisServiceBaseSender extends RedisServiceBase {
 	senderId: string;
 
-	async init(type: RedisClient): Promise<void> {
+	async init(type: RedisClientType): Promise<void> {
 		await super.init(type);
 		this.senderId = config.get('redis.queueModeId');
 	}

packages/cli/src/services/redis/redis-client.service.ts

@@ -2,7 +2,7 @@ import { Service } from 'typedi';
 import { Logger } from '@/Logger';
 import ioRedis from 'ioredis';
 import type { Cluster, RedisOptions } from 'ioredis';
-import type { RedisClient } from './redis.types';
+import type { RedisClientType } from './redis.types';
 
 import { OnShutdown } from '@/decorators/OnShutdown';
 import { LOWEST_SHUTDOWN_PRIORITY } from '@/constants';
@@ -17,7 +17,7 @@ export class RedisClientService {
 		private readonly globalConfig: GlobalConfig,
 	) {}
 
-	createClient(arg: { type: RedisClient; extraOptions?: RedisOptions }) {
+	createClient(arg: { type: RedisClientType; extraOptions?: RedisOptions }) {
 		const client =
 			this.clusterNodes().length > 0
 				? this.createClusterClient(arg)
@@ -56,7 +56,7 @@ export class RedisClientService {
 		type,
 		extraOptions,
 	}: {
-		type: RedisClient;
+		type: RedisClientType;
 		extraOptions?: RedisOptions;
 	}) {
 		const options = this.getOptions({ extraOptions });

packages/cli/src/services/redis/redis.types.ts

@@ -1,4 +1,4 @@
-export type RedisClient = n8nRedisClient | BullRedisClient;
+export type RedisClientType = n8nRedisClientType | BullRedisClientType;
 
 /**
  * Redis client used by n8n.
@@ -7,7 +7,7 @@ export type RedisClient = n8nRedisClient | BullRedisClient;
  * - `publisher(n8n)` to send messages into scaling mode communication channels
  * - `cache(n8n)` for caching operations (variables, resource ownership, etc.)
  */
-type n8nRedisClient = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)';
+type n8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)';
 
 /**
  * Redis client used internally by Bull. Suffixed with `(bull)` at `ScalingService.setupQueue`.
@@ -16,4 +16,4 @@ type n8nRedisClient = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)';
  * - `client(bull)` for general queue operations
  * - `bclient(bull)` for blocking operations when processing jobs
  */
-type BullRedisClient = 'subscriber(bull)' | 'client(bull)' | 'bclient(bull)';
+type BullRedisClientType = 'subscriber(bull)' | 'client(bull)' | 'bclient(bull)';