Merge pull request #514 from jsdelivr/redis-4

perf: reduce data sent in probe sync

Author: MartinKolarik

src/lib/rate-limiter.ts

@@ -6,7 +6,7 @@ import createHttpError from 'http-errors';
 import type { ExtendedContext } from '../types.js';
 import { credits } from './credits.js';
 
-const redisClient = await createPersistentRedisClient({ legacyMode: true });
+const redisClient = createPersistentRedisClient({ legacyMode: true });
 
 export const anonymousRateLimiter = new RateLimiterRedis({
 	storeClient: redisClient,

src/lib/redis/client.ts

@@ -6,11 +6,11 @@ export type { RedisClient } from './shared.js';
 let redis: RedisClient;
 
 export const initRedisClient = async () => {
-	redis = await createRedisClient();
+	redis = createRedisClient();
 	return redis;
 };
 
-const createRedisClient = async (options?: RedisClientOptions): Promise<RedisClient> => {
+const createRedisClient = (options?: RedisClientOptions): RedisClient => {
 	return createRedisClientInternal({
 		...options,
 		database: 2,
@@ -19,9 +19,6 @@ const createRedisClient = async (options?: RedisClientOptions): Promise<RedisCli
 };
 
 export const getRedisClient = (): RedisClient => {
-	if (!redis) {
-		throw new Error('redis connection is not initialized yet');
-	}
-
+	redis = createRedisClient();
 	return redis;
 };

src/lib/redis/measurement-client.ts

@@ -6,11 +6,11 @@ export type { RedisClient } from './shared.js';
 let redis: RedisClient;
 
 export const initMeasurementRedisClient = async () => {
-	redis = await createMeasurementRedisClient();
+	redis = createMeasurementRedisClient();
 	return redis;
 };
 
-export const createMeasurementRedisClient = async (options?: RedisClientOptions): Promise<RedisClient> => {
+export const createMeasurementRedisClient = (options?: RedisClientOptions): RedisClient => {
 	return createRedisClientInternal({
 		...options,
 		database: 0,
@@ -19,9 +19,6 @@ export const createMeasurementRedisClient = async (options?: RedisClientOptions)
 };
 
 export const getMeasurementRedisClient = (): RedisClient => {
-	if (!redis) {
-		throw new Error('redis connection to measurement db is not initialized yet');
-	}
-
+	redis = createMeasurementRedisClient();
 	return redis;
 };

src/lib/redis/persistent-client.ts

@@ -6,11 +6,11 @@ export type { RedisClient } from './shared.js';
 let redis: RedisClient;
 
 export const initPersistentRedisClient = async () => {
-	redis = await createPersistentRedisClient();
+	redis = createPersistentRedisClient();
 	return redis;
 };
 
-export const createPersistentRedisClient = async (options?: RedisClientOptions): Promise<RedisClient> => {
+export const createPersistentRedisClient = (options?: RedisClientOptions): RedisClient => {
 	return createRedisClientInternal({
 		...options,
 		database: 1,
@@ -19,9 +19,6 @@ export const createPersistentRedisClient = async (options?: RedisClientOptions):
 };
 
 export const getPersistentRedisClient = (): RedisClient => {
-	if (!redis) {
-		throw new Error('redis connection to persistent db is not initialized yet');
-	}
-
+	redis = createPersistentRedisClient();
 	return redis;
 };

src/lib/redis/shared.ts

@@ -13,7 +13,7 @@ const logger = scopedLogger('redis-client');
 
 export type RedisClient = RedisClientType<RedisDefaultModules, RedisFunctions, RedisScripts>;
 
-export const createRedisClientInternal = async (options?: RedisClientOptions): Promise<RedisClient> => {
+export const createRedisClientInternal = (options?: RedisClientOptions): RedisClient => {
 	const client = createClient({
 		...config.util.toObject(config.get('redis')) as RedisClientOptions,
 		...options,
@@ -23,9 +23,8 @@ export const createRedisClientInternal = async (options?: RedisClientOptions): P
 	client
 		.on('error', (error: Error) => logger.error('connection error', error))
 		.on('ready', () => logger.info('connection ready'))
-		.on('reconnecting', () => logger.info('reconnecting'));
-
-	await client.connect();
+		.on('reconnecting', () => logger.info('reconnecting'))
+		.connect().catch((error: Error) => logger.error('connection error', error));
 
 	return client;
 };

src/lib/ws/server.ts

@@ -27,8 +27,9 @@ let io: WsServer;
 let syncedProbeList: SyncedProbeList;
 
 export const initWsServer = async () => {
-	const pubClient = getRedisClient().duplicate();
-	const subClient = pubClient.duplicate();
+	const redis = getRedisClient();
+	const pubClient = redis.duplicate();
+	const subClient = redis.duplicate();
 
 	await Promise.all([ pubClient.connect(), subClient.connect() ]);
 
@@ -44,7 +45,7 @@ export const initWsServer = async () => {
 		dynamicPrivateChannels: true,
 	}));
 
-	syncedProbeList = new SyncedProbeList(io.of(PROBES_NAMESPACE), adoptedProbes);
+	syncedProbeList = new SyncedProbeList(redis, io.of(PROBES_NAMESPACE), adoptedProbes);
 
 	await syncedProbeList.sync();
 	syncedProbeList.scheduleSync();