@drift-labs/sdk 2.106.0-beta.1 → 2.106.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.106.0-beta.1
+2.106.0-beta.2

package/lib/browser/index.d.ts

@@ -86,6 +86,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/browser/index.js

@@ -109,6 +109,7 @@ __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
+__exportStar(require("./swift/swiftOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -0,0 +1,28 @@
+import { DriftClient, DriftEnv, OptionalOrderParams, SwiftOrderParamsMessage, UserMap } from '..';
+import { Keypair, TransactionInstruction } from '@solana/web3.js';
+export type SwiftOrderSubscriberConfig = {
+    driftClient: DriftClient;
+    userMap: UserMap;
+    driftEnv: DriftEnv;
+    endpoint?: string;
+    marketIndexes: number[];
+    keypair: Keypair;
+};
+export declare class SwiftOrderSubscriber {
+    private config;
+    private onOrder;
+    private heartbeatTimeout;
+    private readonly heartbeatIntervalMs;
+    private ws;
+    private driftClient;
+    private userMap;
+    subscribed: boolean;
+    constructor(config: SwiftOrderSubscriberConfig, onOrder: (orderMessageRaw: any, swiftOrderParamsMessage: SwiftOrderParamsMessage) => Promise<void>);
+    getSymbolForMarketIndex(marketIndex: number): string;
+    generateChallengeResponse(nonce: string): string;
+    handleAuthMessage(message: any): void;
+    subscribe(): Promise<void>;
+    getPlaceAndMakeSwiftOrderIxs(orderMessageRaw: any, swiftOrderParamsMessage: SwiftOrderParamsMessage, makerOrderParams: OptionalOrderParams): Promise<TransactionInstruction[]>;
+    private startHeartbeatTimer;
+    private reconnect;
+}

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwiftOrderSubscriber = void 0;
+const __1 = require("..");
+const web3_js_1 = require("@solana/web3.js");
+const tweetnacl_1 = __importDefault(require("tweetnacl"));
+const tweetnacl_util_1 = require("tweetnacl-util");
+const ws_1 = __importDefault(require("ws"));
+class SwiftOrderSubscriber {
+    constructor(config, onOrder) {
+        this.config = config;
+        this.onOrder = onOrder;
+        this.heartbeatTimeout = null;
+        this.heartbeatIntervalMs = 60000;
+        this.ws = null;
+        this.subscribed = false;
+        this.driftClient = config.driftClient;
+        this.userMap = config.userMap;
+    }
+    getSymbolForMarketIndex(marketIndex) {
+        const markets = this.config.driftEnv === 'devnet'
+            ? __1.DevnetPerpMarkets
+            : __1.MainnetPerpMarkets;
+        return markets[marketIndex].symbol;
+    }
+    generateChallengeResponse(nonce) {
+        const messageBytes = (0, tweetnacl_util_1.decodeUTF8)(nonce);
+        const signature = tweetnacl_1.default.sign.detached(messageBytes, this.config.keypair.secretKey);
+        const signatureBase64 = Buffer.from(signature).toString('base64');
+        return signatureBase64;
+    }
+    handleAuthMessage(message) {
+        var _a, _b;
+        if (message['channel'] === 'auth' && message['nonce'] != null) {
+            const signatureBase64 = this.generateChallengeResponse(message['nonce']);
+            (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                pubkey: this.config.keypair.publicKey.toBase58(),
+                signature: signatureBase64,
+            }));
+        }
+        if (message['channel'] === 'auth' &&
+            ((_b = message['message']) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'authenticated') {
+            this.subscribed = true;
+            this.config.marketIndexes.forEach(async (marketIndex) => {
+                var _a;
+                (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                    action: 'subscribe',
+                    market_type: 'perp',
+                    market_name: this.getSymbolForMarketIndex(marketIndex),
+                }));
+                await new Promise((resolve) => setTimeout(resolve, 100));
+            });
+        }
+    }
+    async subscribe() {
+        const endpoint = this.config.endpoint || this.config.driftEnv === 'devnet'
+            ? 'wss://master.swift.drift.trade/ws'
+            : 'wss://swift.drift.trade/ws';
+        const ws = new ws_1.default(endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58());
+        this.ws = ws;
+        ws.on('open', async () => {
+            console.log('Connected to the server');
+            ws.on('message', async (data) => {
+                const message = JSON.parse(data.toString());
+                this.startHeartbeatTimer();
+                if (message['channel'] === 'auth') {
+                    this.handleAuthMessage(message);
+                }
+                if (message['order']) {
+                    const order = JSON.parse(message['order']);
+                    const swiftOrderParamsBuf = Buffer.from(order['order_message'], 'base64');
+                    const swiftOrderParamsMessage = this.driftClient.program.coder.types.decode('SwiftOrderParamsMessage', swiftOrderParamsBuf);
+                    if (!swiftOrderParamsMessage.swiftOrderParams.price) {
+                        console.error(`order has no price: ${JSON.stringify(swiftOrderParamsMessage.swiftOrderParams)}`);
+                        return;
+                    }
+                    this.onOrder(order, swiftOrderParamsMessage);
+                }
+            });
+            ws.on('close', () => {
+                console.log('Disconnected from the server');
+                this.reconnect();
+            });
+            ws.on('error', (error) => {
+                console.error('WebSocket error:', error);
+                this.reconnect();
+            });
+        });
+    }
+    async getPlaceAndMakeSwiftOrderIxs(orderMessageRaw, swiftOrderParamsMessage, makerOrderParams) {
+        const swiftOrderParamsBuf = Buffer.from(orderMessageRaw['order_message'], 'base64');
+        const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw['taker_authority']);
+        const takerUserPubkey = await (0, __1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, swiftOrderParamsMessage.subAccountId);
+        const takerUserAccount = (await this.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
+        const ixs = await this.driftClient.getPlaceAndMakeSwiftPerpOrderIxs(swiftOrderParamsBuf, Buffer.from(orderMessageRaw['order_signature'], 'base64'), (0, tweetnacl_util_1.decodeUTF8)(orderMessageRaw['uuid']), {
+            taker: takerUserPubkey,
+            takerUserAccount,
+            takerStats: (0, __1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, takerUserAccount.authority),
+        }, Object.assign({}, makerOrderParams, {
+            postOnly: __1.PostOnlyParams.MUST_POST_ONLY,
+            immediateOrCancel: true,
+            marketType: __1.MarketType.PERP,
+        }));
+        return ixs;
+    }
+    startHeartbeatTimer() {
+        if (this.heartbeatTimeout) {
+            clearTimeout(this.heartbeatTimeout);
+        }
+        this.heartbeatTimeout = setTimeout(() => {
+            console.warn('No heartbeat received within 30 seconds, reconnecting...');
+            this.reconnect();
+        }, this.heartbeatIntervalMs);
+    }
+    reconnect() {
+        if (this.ws) {
+            this.ws.removeAllListeners();
+            this.ws.terminate();
+        }
+        console.log('Reconnecting to WebSocket...');
+        setTimeout(() => {
+            this.subscribe();
+        }, 1000);
+    }
+}
+exports.SwiftOrderSubscriber = SwiftOrderSubscriber;

package/lib/node/index.d.ts

@@ -86,6 +86,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/node/index.js

@@ -109,6 +109,7 @@ __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
+__exportStar(require("./swift/swiftOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/node/swift/swiftOrderSubscriber.d.ts

@@ -0,0 +1,28 @@
+import { DriftClient, DriftEnv, OptionalOrderParams, SwiftOrderParamsMessage, UserMap } from '..';
+import { Keypair, TransactionInstruction } from '@solana/web3.js';
+export type SwiftOrderSubscriberConfig = {
+    driftClient: DriftClient;
+    userMap: UserMap;
+    driftEnv: DriftEnv;
+    endpoint?: string;
+    marketIndexes: number[];
+    keypair: Keypair;
+};
+export declare class SwiftOrderSubscriber {
+    private config;
+    private onOrder;
+    private heartbeatTimeout;
+    private readonly heartbeatIntervalMs;
+    private ws;
+    private driftClient;
+    private userMap;
+    subscribed: boolean;
+    constructor(config: SwiftOrderSubscriberConfig, onOrder: (orderMessageRaw: any, swiftOrderParamsMessage: SwiftOrderParamsMessage) => Promise<void>);
+    getSymbolForMarketIndex(marketIndex: number): string;
+    generateChallengeResponse(nonce: string): string;
+    handleAuthMessage(message: any): void;
+    subscribe(): Promise<void>;
+    getPlaceAndMakeSwiftOrderIxs(orderMessageRaw: any, swiftOrderParamsMessage: SwiftOrderParamsMessage, makerOrderParams: OptionalOrderParams): Promise<TransactionInstruction[]>;
+    private startHeartbeatTimer;
+    private reconnect;
+}

package/lib/node/swift/swiftOrderSubscriber.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwiftOrderSubscriber = void 0;
+const __1 = require("..");
+const web3_js_1 = require("@solana/web3.js");
+const tweetnacl_1 = __importDefault(require("tweetnacl"));
+const tweetnacl_util_1 = require("tweetnacl-util");
+const ws_1 = __importDefault(require("ws"));
+class SwiftOrderSubscriber {
+    constructor(config, onOrder) {
+        this.config = config;
+        this.onOrder = onOrder;
+        this.heartbeatTimeout = null;
+        this.heartbeatIntervalMs = 60000;
+        this.ws = null;
+        this.subscribed = false;
+        this.driftClient = config.driftClient;
+        this.userMap = config.userMap;
+    }
+    getSymbolForMarketIndex(marketIndex) {
+        const markets = this.config.driftEnv === 'devnet'
+            ? __1.DevnetPerpMarkets
+            : __1.MainnetPerpMarkets;
+        return markets[marketIndex].symbol;
+    }
+    generateChallengeResponse(nonce) {
+        const messageBytes = (0, tweetnacl_util_1.decodeUTF8)(nonce);
+        const signature = tweetnacl_1.default.sign.detached(messageBytes, this.config.keypair.secretKey);
+        const signatureBase64 = Buffer.from(signature).toString('base64');
+        return signatureBase64;
+    }
+    handleAuthMessage(message) {
+        var _a, _b;
+        if (message['channel'] === 'auth' && message['nonce'] != null) {
+            const signatureBase64 = this.generateChallengeResponse(message['nonce']);
+            (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                pubkey: this.config.keypair.publicKey.toBase58(),
+                signature: signatureBase64,
+            }));
+        }
+        if (message['channel'] === 'auth' &&
+            ((_b = message['message']) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'authenticated') {
+            this.subscribed = true;
+            this.config.marketIndexes.forEach(async (marketIndex) => {
+                var _a;
+                (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                    action: 'subscribe',
+                    market_type: 'perp',
+                    market_name: this.getSymbolForMarketIndex(marketIndex),
+                }));
+                await new Promise((resolve) => setTimeout(resolve, 100));
+            });
+        }
+    }
+    async subscribe() {
+        const endpoint = this.config.endpoint || this.config.driftEnv === 'devnet'
+            ? 'wss://master.swift.drift.trade/ws'
+            : 'wss://swift.drift.trade/ws';
+        const ws = new ws_1.default(endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58());
+        this.ws = ws;
+        ws.on('open', async () => {
+            console.log('Connected to the server');
+            ws.on('message', async (data) => {
+                const message = JSON.parse(data.toString());
+                this.startHeartbeatTimer();
+                if (message['channel'] === 'auth') {
+                    this.handleAuthMessage(message);
+                }
+                if (message['order']) {
+                    const order = JSON.parse(message['order']);
+                    const swiftOrderParamsBuf = Buffer.from(order['order_message'], 'base64');
+                    const swiftOrderParamsMessage = this.driftClient.program.coder.types.decode('SwiftOrderParamsMessage', swiftOrderParamsBuf);
+                    if (!swiftOrderParamsMessage.swiftOrderParams.price) {
+                        console.error(`order has no price: ${JSON.stringify(swiftOrderParamsMessage.swiftOrderParams)}`);
+                        return;
+                    }
+                    this.onOrder(order, swiftOrderParamsMessage);
+                }
+            });
+            ws.on('close', () => {
+                console.log('Disconnected from the server');
+                this.reconnect();
+            });
+            ws.on('error', (error) => {
+                console.error('WebSocket error:', error);
+                this.reconnect();
+            });
+        });
+    }
+    async getPlaceAndMakeSwiftOrderIxs(orderMessageRaw, swiftOrderParamsMessage, makerOrderParams) {
+        const swiftOrderParamsBuf = Buffer.from(orderMessageRaw['order_message'], 'base64');
+        const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw['taker_authority']);
+        const takerUserPubkey = await (0, __1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, swiftOrderParamsMessage.subAccountId);
+        const takerUserAccount = (await this.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
+        const ixs = await this.driftClient.getPlaceAndMakeSwiftPerpOrderIxs(swiftOrderParamsBuf, Buffer.from(orderMessageRaw['order_signature'], 'base64'), (0, tweetnacl_util_1.decodeUTF8)(orderMessageRaw['uuid']), {
+            taker: takerUserPubkey,
+            takerUserAccount,
+            takerStats: (0, __1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, takerUserAccount.authority),
+        }, Object.assign({}, makerOrderParams, {
+            postOnly: __1.PostOnlyParams.MUST_POST_ONLY,
+            immediateOrCancel: true,
+            marketType: __1.MarketType.PERP,
+        }));
+        return ixs;
+    }
+    startHeartbeatTimer() {
+        if (this.heartbeatTimeout) {
+            clearTimeout(this.heartbeatTimeout);
+        }
+        this.heartbeatTimeout = setTimeout(() => {
+            console.warn('No heartbeat received within 30 seconds, reconnecting...');
+            this.reconnect();
+        }, this.heartbeatIntervalMs);
+    }
+    reconnect() {
+        if (this.ws) {
+            this.ws.removeAllListeners();
+            this.ws.terminate();
+        }
+        console.log('Reconnecting to WebSocket...');
+        setTimeout(() => {
+            this.subscribe();
+        }, 1000);
+    }
+}
+exports.SwiftOrderSubscriber = SwiftOrderSubscriber;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.106.0-beta.1",
+	"version": "2.106.0-beta.2",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",
@@ -56,6 +56,7 @@
 		"solana-bankrun": "0.3.1",
 		"strict-event-emitter-types": "2.0.0",
 		"tweetnacl": "1.0.3",
+		"tweetnacl-util": "0.15.1",
 		"uuid": "8.3.2",
 		"yargs": "17.7.2",
 		"zstddec": "0.1.0"

package/src/index.ts

@@ -87,6 +87,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/src/swift/swiftOrderSubscriber.ts

@@ -0,0 +1,211 @@
+import {
+	DevnetPerpMarkets,
+	DriftClient,
+	DriftEnv,
+	getUserAccountPublicKey,
+	getUserStatsAccountPublicKey,
+	MainnetPerpMarkets,
+	MarketType,
+	OptionalOrderParams,
+	PostOnlyParams,
+	SwiftOrderParamsMessage,
+	UserMap,
+} from '..';
+import { Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import nacl from 'tweetnacl';
+import { decodeUTF8 } from 'tweetnacl-util';
+import WebSocket from 'ws';
+
+export type SwiftOrderSubscriberConfig = {
+	driftClient: DriftClient;
+	userMap: UserMap;
+	driftEnv: DriftEnv;
+	endpoint?: string;
+	marketIndexes: number[];
+	keypair: Keypair;
+};
+
+export class SwiftOrderSubscriber {
+	private heartbeatTimeout: NodeJS.Timeout | null = null;
+	private readonly heartbeatIntervalMs = 60000;
+	private ws: WebSocket | null = null;
+	private driftClient: DriftClient;
+	private userMap: UserMap;
+	subscribed = false;
+
+	constructor(
+		private config: SwiftOrderSubscriberConfig,
+		private onOrder: (
+			orderMessageRaw: any,
+			swiftOrderParamsMessage: SwiftOrderParamsMessage
+		) => Promise<void>
+	) {
+		this.driftClient = config.driftClient;
+		this.userMap = config.userMap;
+	}
+
+	getSymbolForMarketIndex(marketIndex: number): string {
+		const markets =
+			this.config.driftEnv === 'devnet'
+				? DevnetPerpMarkets
+				: MainnetPerpMarkets;
+		return markets[marketIndex].symbol;
+	}
+
+	generateChallengeResponse(nonce: string): string {
+		const messageBytes = decodeUTF8(nonce);
+		const signature = nacl.sign.detached(
+			messageBytes,
+			this.config.keypair.secretKey
+		);
+		const signatureBase64 = Buffer.from(signature).toString('base64');
+		return signatureBase64;
+	}
+
+	handleAuthMessage(message: any): void {
+		if (message['channel'] === 'auth' && message['nonce'] != null) {
+			const signatureBase64 = this.generateChallengeResponse(message['nonce']);
+			this.ws?.send(
+				JSON.stringify({
+					pubkey: this.config.keypair.publicKey.toBase58(),
+					signature: signatureBase64,
+				})
+			);
+		}
+
+		if (
+			message['channel'] === 'auth' &&
+			message['message']?.toLowerCase() === 'authenticated'
+		) {
+			this.subscribed = true;
+			this.config.marketIndexes.forEach(async (marketIndex) => {
+				this.ws?.send(
+					JSON.stringify({
+						action: 'subscribe',
+						market_type: 'perp',
+						market_name: this.getSymbolForMarketIndex(marketIndex),
+					})
+				);
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+		}
+	}
+
+	async subscribe(): Promise<void> {
+		const endpoint =
+			this.config.endpoint || this.config.driftEnv === 'devnet'
+				? 'wss://master.swift.drift.trade/ws'
+				: 'wss://swift.drift.trade/ws';
+		const ws = new WebSocket(
+			endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58()
+		);
+		this.ws = ws;
+		ws.on('open', async () => {
+			console.log('Connected to the server');
+
+			ws.on('message', async (data: WebSocket.Data) => {
+				const message = JSON.parse(data.toString());
+				this.startHeartbeatTimer();
+
+				if (message['channel'] === 'auth') {
+					this.handleAuthMessage(message);
+				}
+
+				if (message['order']) {
+					const order = JSON.parse(message['order']);
+					const swiftOrderParamsBuf = Buffer.from(
+						order['order_message'],
+						'base64'
+					);
+					const swiftOrderParamsMessage: SwiftOrderParamsMessage =
+						this.driftClient.program.coder.types.decode(
+							'SwiftOrderParamsMessage',
+							swiftOrderParamsBuf
+						);
+
+					if (!swiftOrderParamsMessage.swiftOrderParams.price) {
+						console.error(
+							`order has no price: ${JSON.stringify(
+								swiftOrderParamsMessage.swiftOrderParams
+							)}`
+						);
+						return;
+					}
+
+					this.onOrder(order, swiftOrderParamsMessage);
+				}
+			});
+
+			ws.on('close', () => {
+				console.log('Disconnected from the server');
+				this.reconnect();
+			});
+
+			ws.on('error', (error: Error) => {
+				console.error('WebSocket error:', error);
+				this.reconnect();
+			});
+		});
+	}
+
+	async getPlaceAndMakeSwiftOrderIxs(
+		orderMessageRaw: any,
+		swiftOrderParamsMessage: SwiftOrderParamsMessage,
+		makerOrderParams: OptionalOrderParams
+	): Promise<TransactionInstruction[]> {
+		const swiftOrderParamsBuf = Buffer.from(
+			orderMessageRaw['order_message'],
+			'base64'
+		);
+		const takerAuthority = new PublicKey(orderMessageRaw['taker_authority']);
+		const takerUserPubkey = await getUserAccountPublicKey(
+			this.driftClient.program.programId,
+			takerAuthority,
+			swiftOrderParamsMessage.subAccountId
+		);
+		const takerUserAccount = (
+			await this.userMap.mustGet(takerUserPubkey.toString())
+		).getUserAccount();
+		const ixs = await this.driftClient.getPlaceAndMakeSwiftPerpOrderIxs(
+			swiftOrderParamsBuf,
+			Buffer.from(orderMessageRaw['order_signature'], 'base64'),
+			decodeUTF8(orderMessageRaw['uuid']),
+			{
+				taker: takerUserPubkey,
+				takerUserAccount,
+				takerStats: getUserStatsAccountPublicKey(
+					this.driftClient.program.programId,
+					takerUserAccount.authority
+				),
+			},
+			Object.assign({}, makerOrderParams, {
+				postOnly: PostOnlyParams.MUST_POST_ONLY,
+				immediateOrCancel: true,
+				marketType: MarketType.PERP,
+			})
+		);
+		return ixs;
+	}
+
+	private startHeartbeatTimer() {
+		if (this.heartbeatTimeout) {
+			clearTimeout(this.heartbeatTimeout);
+		}
+		this.heartbeatTimeout = setTimeout(() => {
+			console.warn('No heartbeat received within 30 seconds, reconnecting...');
+			this.reconnect();
+		}, this.heartbeatIntervalMs);
+	}
+
+	private reconnect() {
+		if (this.ws) {
+			this.ws.removeAllListeners();
+			this.ws.terminate();
+		}
+
+		console.log('Reconnecting to WebSocket...');
+		setTimeout(() => {
+			this.subscribe();
+		}, 1000);
+	}
+}