From a4312acf036cffe56bfeb568625bf8684334e84c Mon Sep 17 00:00:00 2001
From: Jack Waller <jack.waller94@gmail.com>
Date: Thu, 23 May 2024 13:10:20 +1000
Subject: [PATCH] chore: sanitise channel for client

---
 src/wsConnectionManager.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts
index 2bfb2c6..d0cd4e7 100644
--- a/src/wsConnectionManager.ts
+++ b/src/wsConnectionManager.ts
@@ -35,9 +35,12 @@ console.log(`WS LISTENER PORT : ${WS_PORT}`);
 
 const MAX_BUFFERED_AMOUNT = 300000;
 const CHANNEL_PREFIX = RedisClientPrefix.DLOB;
+const CHANNEL_PREFIX_HELIUS = RedisClientPrefix.DLOB_HELIUS;
 
-const safeGetRawChannelFromMessage = (message: any): string => {
-	return message?.channel;
+const sanitiseChannelForClient = (channel: string): string => {
+	return channel
+		.replace(CHANNEL_PREFIX, '')
+		.replace(CHANNEL_PREFIX_HELIUS, '');
 };
 
 const getRedisChannelFromMessage = (message: any): string => {
@@ -69,7 +72,7 @@ const getRedisChannelFromMessage = (message: any): string => {
 		case 'orderbook':
 			return `${CHANNEL_PREFIX}orderbook_${marketType}_${marketIndex}`;
 		case 'priorityfees':
-			return `${CHANNEL_PREFIX}priorityFees_${marketType}_${marketIndex}`;
+			return `${CHANNEL_PREFIX_HELIUS}priorityFees_${marketType}_${marketIndex}`;
 		case undefined:
 		default:
 			throw new Error('Bad channel specified');
@@ -105,7 +108,10 @@ async function main() {
 					ws.bufferedAmount < MAX_BUFFERED_AMOUNT
 				)
 					ws.send(
-						JSON.stringify({ channel: subscribedChannel, data: message })
+						JSON.stringify({
+							channel: sanitiseChannelForClient(subscribedChannel),
+							data: message,
+						})
 					);
 			});
 		}
@@ -135,7 +141,7 @@ async function main() {
 					try {
 						redisChannel = getRedisChannelFromMessage(parsedMessage);
 					} catch (error) {
-						const requestChannel = safeGetRawChannelFromMessage(parsedMessage);
+						const requestChannel = sanitiseChannelForClient(parsedMessage?.channel);
 						if (requestChannel) {
 							ws.send(
 								JSON.stringify({
@@ -208,7 +214,7 @@ async function main() {
 					try {
 						redisChannel = getRedisChannelFromMessage(parsedMessage);
 					} catch (error) {
-						const requestChannel = safeGetRawChannelFromMessage(parsedMessage);
+						const requestChannel = sanitiseChannelForClient(parsedMessage?.channel);
 						if (requestChannel) {
 							console.log('Error unsubscribing from channel:', error.message);
 							ws.send(