add back websocket support as env var toggle

src/index.ts

@@ -24,6 +24,9 @@ import {
 	UserStatsMap,
 	DLOBSubscriber,
 	BulkAccountLoader,
+	DriftClientSubscriptionConfig,
+	SlotSubscriber,
+	SlotSource,
 } from '@drift-labs/sdk';
 
 import { logger, setLogLevel } from './utils/logger';
@@ -53,6 +56,7 @@ const sdkConfig = initialize({ env: process.env.ENV });
 const stateCommitment: Commitment = 'processed';
 const serverPort = process.env.PORT || 6969;
 export const ORDERBOOK_UPDATE_INTERVAL = 1000;
+const useWebsocket = process.env.USE_WEBSOCKET?.toLowerCase() === 'true';
 
 const rateLimitCallsPerSecond = process.env.RATE_LIMIT_CALLS_PER_SECOND
 	? parseInt(process.env.RATE_LIMIT_CALLS_PER_SECOND)
@@ -117,6 +121,7 @@ const endpoint = process.env.ENDPOINT;
 const wsEndpoint = process.env.WS_ENDPOINT;
 logger.info(`RPC endpoint: ${endpoint}`);
 logger.info(`WS endpoint:  ${wsEndpoint}`);
+logger.info(`useWebsocket: ${useWebsocket}`);
 logger.info(`DriftEnv:     ${driftEnv}`);
 logger.info(`Commit:       ${commitHash}`);
 
@@ -171,33 +176,52 @@ const main = async () => {
 		commitment: stateCommitment,
 	});
 
-	const bulkAccountLoader = new BulkAccountLoader(
+	// only set when polling
-		connection,
+	let bulkAccountLoader: BulkAccountLoader | undefined;
-		stateCommitment,
+
-		ORDERBOOK_UPDATE_INTERVAL
+	// only set when using websockets
-	);
+	let slotSubscriber: SlotSubscriber | undefined;
+
+	let accountSubscription: DriftClientSubscriptionConfig;
+	let slotSource: SlotSource;
+
+	if (!useWebsocket) {
+		bulkAccountLoader = new BulkAccountLoader(
+			connection,
+			stateCommitment,
+			ORDERBOOK_UPDATE_INTERVAL
+		);
+
+		accountSubscription = {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		};
+		slotSource = {
+			getSlot: () => bulkAccountLoader!.getSlot(),
+		};
+	} else {
+		accountSubscription = {
+			type: 'websocket',
+			commitment: stateCommitment,
+		};
+		slotSubscriber = new SlotSubscriber(connection);
+		await slotSubscriber.subscribe();
+		slotSource = {
+			getSlot: () => slotSubscriber!.getSlot(),
+		};
+	}
 
 	driftClient = new DriftClient({
 		connection,
 		wallet,
 		programID: clearingHousePublicKey,
-		accountSubscription: {
+		accountSubscription,
-			type: 'polling',
-			accountLoader: bulkAccountLoader,
-		},
 		env: driftEnv,
 		userStats: true,
 	});
 
 	const dlobCoder = DLOBOrdersCoder.create();
 
-	const lamportsBalance = await connection.getBalance(wallet.publicKey);
-	logger.info(
-		`DriftClient ProgramId: ${driftClient.program.programId.toBase58()}`
-	);
-	logger.info(`Wallet pubkey: ${wallet.publicKey.toBase58()}`);
-	logger.info(` . SOL balance: ${lamportsBalance / 10 ** 9}`);
-
 	await driftClient.subscribe();
 	driftClient.eventEmitter.on('error', (e) => {
 		logger.info('clearing house error');
@@ -205,28 +229,39 @@ const main = async () => {
 	});
 
 	setInterval(async () => {
-		lastSlotReceived = bulkAccountLoader.getSlot();
+		lastSlotReceived = slotSource.getSlot();
 	}, ORDERBOOK_UPDATE_INTERVAL);
 
+	logger.info(`Initializing userMap...`);
+	const initUserMapStart = Date.now();
 	const userMap = new UserMap(
 		driftClient,
 		driftClient.userAccountSubscriptionConfig,
 		false
 	);
 	await userMap.subscribe();
-	const userStatsMap = new UserStatsMap(driftClient, {
+	logger.info(`userMap initialized in ${Date.now() - initUserMapStart} ms`);
-		type: 'polling',
-		accountLoader: new BulkAccountLoader(connection, stateCommitment, 0),
-	});
-	await userStatsMap.subscribe();
 
+	logger.info(`Initializing userStatsMap...`);
+	const initUserStatsMapStart = Date.now();
+	const userStatsMap = new UserStatsMap(driftClient, accountSubscription);
+	await userStatsMap.subscribe();
+	logger.info(
+		`userStatsMap initialized in ${Date.now() - initUserStatsMapStart} ms`
+	);
+
+	logger.info(`Initializing DLOBSubscriber...`);
+	const initDlobSubscriberStart = Date.now();
 	const dlobSubscriber = new DLOBSubscriber({
 		driftClient,
 		dlobSource: userMap,
-		slotSource: bulkAccountLoader,
+		slotSource,
 		updateFrequency: ORDERBOOK_UPDATE_INTERVAL,
 	});
 	await dlobSubscriber.subscribe();
+	logger.info(
+		`DLOBSubscriber initialized in ${Date.now() - initDlobSubscriberStart} ms`
+	);
 
 	MARKET_SUBSCRIBERS = await initializeAllMarketSubscribers(driftClient);
 
@@ -253,7 +288,7 @@ const main = async () => {
 			// object with userAccount key and orders object serialized
 			const orders: Array<any> = [];
 			const oracles: Array<any> = [];
-			const slot = bulkAccountLoader.getSlot();
+			const slot = slotSource.getSlot();
 
 			for (const market of driftClient.getPerpMarketAccounts()) {
 				const oracle = driftClient.getOracleDataForPerpMarket(
@@ -297,7 +332,7 @@ const main = async () => {
 	app.get('/orders/json', async (_req, res, next) => {
 		try {
 			// object with userAccount key and orders object serialized
-			const slot = bulkAccountLoader.getSlot();
+			const slot = slotSource.getSlot();
 			const orders: Array<any> = [];
 			const oracles: Array<any> = [];
 			for (const market of driftClient.getPerpMarketAccounts()) {
@@ -460,7 +495,7 @@ const main = async () => {
 
 			res.end(
 				JSON.stringify({
-					slot: bulkAccountLoader.getSlot(),
+					slot: slotSource.getSlot(),
 					data: dlobCoder.encode(dlobOrders).toString('base64'),
 				})
 			);
@@ -549,7 +584,7 @@ const main = async () => {
 						.getDLOB()
 						.getRestingLimitBids(
 							normedMarketIndex,
-							bulkAccountLoader.getSlot(),
+							slotSource.getSlot(),
 							normedMarketType,
 							oracle
 						)
@@ -560,7 +595,7 @@ const main = async () => {
 						.getDLOB()
 						.getRestingLimitAsks(
 							normedMarketIndex,
-							bulkAccountLoader.getSlot(),
+							slotSource.getSlot(),
 							normedMarketType,
 							oracle
 						)