refactor(self-hosting): forward every setting, drop dead config (#3047)

fluxer_api/pkgs/kv_client/src/KVClient.ts

@@ -302,10 +302,8 @@ export class KVClient implements IKVProvider {
 	}
 
 	private createClusterClient(clusterConfig: ResolvedKVClientConfig): Cluster {
-		const {nodes, redisOptions} = resolveKVClusterConnection(clusterConfig.url, clusterConfig.clusterNodes);
-		const natMap = clusterConfig.clusterNatMap;
-		const hasNatMap = Object.keys(natMap).length > 0;
-		return new Cluster(nodes, {
+		const {node, redisOptions} = resolveKVClusterConnection(clusterConfig.url);
+		return new Cluster([node], {
 			clusterRetryStrategy: createRetryStrategy(),
 			redisOptions: {
 				...redisOptions,
@@ -315,7 +313,6 @@ export class KVClient implements IKVProvider {
 				protocol: 2,
 			},
 			scaleReads: 'master',
-			...(hasNatMap ? {natMap} : {}),
 		});
 	}
 
@@ -591,7 +588,6 @@ export class KVClient implements IKVProvider {
 		return new KVSubscription({
 			url: this.url,
 			mode: this.config.mode,
-			clusterNodes: this.config.clusterNodes,
 			timeoutMs: this.timeoutMs,
 			logger: this.logger,
 		});

fluxer_api/pkgs/kv_client/src/KVClientConfig.ts

@@ -9,16 +9,9 @@ export interface IKVLogger {
 
 export type KVClientMode = 'standalone' | 'cluster';
 
-export interface KVClusterNode {
-	host: string;
-	port: number;
-}
-
 export interface KVClientConfig {
 	url: string;
 	mode?: KVClientMode;
-	clusterNodes?: Array<KVClusterNode>;
-	clusterNatMap?: Record<string, KVClusterNode>;
 	timeoutMs?: number;
 	logger?: IKVLogger;
 }
@@ -26,8 +19,6 @@ export interface KVClientConfig {
 export interface ResolvedKVClientConfig {
 	url: string;
 	mode: KVClientMode;
-	clusterNodes: Array<KVClusterNode>;
-	clusterNatMap: Record<string, KVClusterNode>;
 	timeoutMs: number;
 	logger: IKVLogger;
 }
@@ -42,8 +33,6 @@ export function resolveKVClientConfig(config: KVClientConfig | string): Resolved
 	return {
 		url: normalizeUrl(options.url),
 		mode: options.mode ?? 'standalone',
-		clusterNodes: options.clusterNodes ?? [],
-		clusterNatMap: options.clusterNatMap ?? {},
 		timeoutMs: options.timeoutMs ?? DEFAULT_KV_TIMEOUT_MS,
 		logger: options.logger ?? noopLogger,
 	};

fluxer_api/pkgs/kv_client/src/KVClusterConnection.ts

@@ -1,13 +1,12 @@
 import {domainToASCII} from 'node:url';
-import type {KVClusterNode} from '@pkgs/kv_client/src/KVClientConfig';
 import type {RedisOptions} from 'ioredis';
 
 interface KVClusterConnection {
-	nodes: Array<KVClusterNode>;
+	node: {host: string; port: number};
 	redisOptions: RedisOptions;
 }
 
-export function resolveKVClusterConnection(url: string, nodes: ReadonlyArray<KVClusterNode>): KVClusterConnection {
+export function resolveKVClusterConnection(url: string): KVClusterConnection {
 	const normalizedUrl = url.trim();
 	for (let index = 0; index < normalizedUrl.length; index++) {
 		const code = normalizedUrl.charCodeAt(index);
@@ -46,17 +45,8 @@ export function resolveKVClusterConnection(url: string, nodes: ReadonlyArray<KVC
 		redisOptions.tls = {};
 	}
 	const host = resolveClusterHost(authority, parsed);
-	const resolvedNodes = nodes.length > 0 ? [...nodes] : [{host, port: Number(parsed.port || '6379')}];
-	for (const node of resolvedNodes) {
-		if (node.host.trim().length === 0) {
-			throw new Error('KV cluster node must include a host');
-		}
-		if (!Number.isInteger(node.port) || node.port < 1 || node.port > 65535) {
-			throw new Error('KV cluster node port must be an integer between 1 and 65535');
-		}
-	}
 	return {
-		nodes: resolvedNodes,
+		node: {host, port: Number(parsed.port || '6379')},
 		redisOptions,
 	};
 }

fluxer_api/pkgs/kv_client/src/KVSubscription.ts

@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import type {IKVSubscription} from '@pkgs/kv_client/src/IKVProvider';
-import type {IKVLogger, KVClientMode, KVClusterNode} from '@pkgs/kv_client/src/KVClientConfig';
+import type {IKVLogger, KVClientMode} from '@pkgs/kv_client/src/KVClientConfig';
 import {resolveKVClusterConnection} from '@pkgs/kv_client/src/KVClusterConnection';
 import Redis, {type RedisOptions} from 'ioredis';
 
 interface KVSubscriptionConfig {
 	url: string;
 	mode?: KVClientMode;
-	clusterNodes?: Array<KVClusterNode>;
 	timeoutMs: number;
 	logger: IKVLogger;
 }
@@ -21,7 +20,6 @@ interface KVSubscriptionConnect {
 export class KVSubscription implements IKVSubscription {
 	private readonly url: string;
 	private readonly mode: KVClientMode;
-	private readonly clusterNodes: Array<KVClusterNode>;
 	private readonly timeoutMs: number;
 	private readonly logger: IKVLogger;
 	private readonly desiredChannels = new Set<string>();
@@ -34,7 +32,6 @@ export class KVSubscription implements IKVSubscription {
 	constructor(config: KVSubscriptionConfig) {
 		this.url = config.url;
 		this.mode = config.mode ?? 'standalone';
-		this.clusterNodes = config.clusterNodes ?? [];
 		this.timeoutMs = config.timeoutMs;
 		this.logger = config.logger;
 	}
@@ -75,9 +72,9 @@ export class KVSubscription implements IKVSubscription {
 			protocol: 2,
 			retryStrategy: createRetryStrategy(),
 		};
-		const connection = this.mode === 'cluster' ? resolveKVClusterConnection(this.url, this.clusterNodes) : null;
+		const connection = this.mode === 'cluster' ? resolveKVClusterConnection(this.url) : null;
 		const client = connection
-			? new Redis({...connection.redisOptions, ...connection.nodes[0], db: 0, ...options})
+			? new Redis({...connection.redisOptions, ...connection.node, db: 0, ...options})
 			: new Redis(this.url, options);
 		client.on('message', (channel: string, message: string) => {
 			if (this.client !== client || this.closing !== null) {