From 5a92750b54cae9d9ee76095b57402c59282ccc6c Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:53:47 +0000 Subject: [PATCH 1/5] Bumping drift-common to 5b9a0026783451597eae8d7218a400338928a165 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 3917402..5b9a002 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 3917402307194fa6d992c1d749513cb89317c889 +Subproject commit 5b9a0026783451597eae8d7218a400338928a165 From 22090f9f3b9d56e9bc12a01da946fffc3babfe12 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:45:59 +0000 Subject: [PATCH 2/5] Bumping drift-common to 8178bc7515ef09c51290c1463bf7eba3c28de214 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 5b9a002..8178bc7 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 5b9a0026783451597eae8d7218a400338928a165 +Subproject commit 8178bc7515ef09c51290c1463bf7eba3c28de214 From 8952cc20e0aa59b72c84f8c6dd404f0711e616ee Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:31:19 +0000 Subject: [PATCH 3/5] Bumping drift-common to c251089a1a4f10ad21814358290dab2541a6eb66 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 8178bc7..c251089 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 8178bc7515ef09c51290c1463bf7eba3c28de214 +Subproject commit c251089a1a4f10ad21814358290dab2541a6eb66 From d43d2d2591af35b425850f527aa1ce649ce7ab39 Mon Sep 17 00:00:00 2001 From: Jack Waller Date: Thu, 21 Nov 2024 11:57:03 -0500 Subject: [PATCH 4/5] chore: update trades to helius --- src/publishers/tradesPublisher.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index 28dab5b..a625bd4 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -36,7 +36,7 @@ setGlobalDispatcher( require('dotenv').config(); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; const commitHash = process.env.COMMIT; -const redisClientPrefix = RedisClientPrefix.DLOB; +const redisClientPrefix = RedisClientPrefix.DLOB_HELIUS; //@ts-ignore const sdkConfig = initialize({ env: process.env.ENV }); From 4b9b337a60cfaa2d94b20dc74a1fdfc16fa73185 Mon Sep 17 00:00:00 2001 From: Jack Waller Date: Thu, 21 Nov 2024 12:22:47 -0500 Subject: [PATCH 5/5] chore: update clients to be env vars --- src/index.ts | 10 ++++++++-- src/publishers/tradesPublisher.ts | 4 +++- src/serverLite.ts | 9 ++++++++- src/wsConnectionManager.ts | 4 +++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index e275b8d..a4ebfed 100644 --- a/src/index.ts +++ b/src/index.ts @@ -62,8 +62,14 @@ setGlobalDispatcher( require('dotenv').config(); -// Reading in Redis env vars -const REDIS_CLIENTS = [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; +const envClients = []; +const clients = process.env.REDIS_CLIENT.trim() + .replace(/^\[|\]$/g, '') + .split(/\s*,\s*/); + +clients.forEach((client) => envClients.push(RedisClientPrefix[client])); + +const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index a625bd4..3f75af3 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -36,7 +36,9 @@ setGlobalDispatcher( require('dotenv').config(); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; const commitHash = process.env.COMMIT; -const redisClientPrefix = RedisClientPrefix.DLOB_HELIUS; +const REDIS_CLIENT = process.env.REDIS_CLIENT || 'DLOB'; +console.log('Redis Clients:', REDIS_CLIENT); +const redisClientPrefix = RedisClientPrefix[REDIS_CLIENT]; //@ts-ignore const sdkConfig = initialize({ env: process.env.ENV }); diff --git a/src/serverLite.ts b/src/serverLite.ts index 7d65dbb..9ab8e30 100644 --- a/src/serverLite.ts +++ b/src/serverLite.ts @@ -38,7 +38,14 @@ setGlobalDispatcher( require('dotenv').config(); // Reading in Redis env vars -const REDIS_CLIENTS = [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; +const envClients = []; +const clients = process.env.REDIS_CLIENT.trim() + .replace(/^\[|\]$/g, '') + .split(/\s*,\s*/); + +clients.forEach((client) => envClients.push(RedisClientPrefix[client])); + +const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index 194f045..bc7c3ef 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -34,7 +34,9 @@ const WS_PORT = process.env.WS_PORT || '3000'; console.log(`WS LISTENER PORT : ${WS_PORT}`); const MAX_BUFFERED_AMOUNT = 300000; -const CHANNEL_PREFIX = RedisClientPrefix.DLOB; +const REDIS_CLIENT = process.env.REDIS_CLIENT || 'DLOB'; +const CHANNEL_PREFIX = RedisClientPrefix[REDIS_CLIENT]; +console.log('Redis Clients:', REDIS_CLIENT); const CHANNEL_PREFIX_HELIUS = RedisClientPrefix.DLOB_HELIUS; const sanitiseChannelForClient = (channel: string | undefined): string => {