@drift-labs/sdk 2.82.0-beta.1 → 2.82.0-beta.10

package/lib/tx/types.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfirmationStrategy = void 0;
+exports.TxSendError = exports.ConfirmationStrategy = void 0;
 var ConfirmationStrategy;
 (function (ConfirmationStrategy) {
     ConfirmationStrategy["WebSocket"] = "websocket";
     ConfirmationStrategy["Polling"] = "polling";
     ConfirmationStrategy["Combo"] = "combo";
 })(ConfirmationStrategy = exports.ConfirmationStrategy || (exports.ConfirmationStrategy = {}));
+class TxSendError extends Error {
+    constructor(message, code) {
+        super(message);
+        this.message = message;
+        this.code = code;
+        if (Error.captureStackTrace) {
+            Error.captureStackTrace(this, TxSendError);
+        }
+    }
+}
+exports.TxSendError = TxSendError;

package/lib/tx/utils.js

@@ -30,7 +30,11 @@ async function getSignedTransactionMap(wallet, txsToSign, keys) {
             keysWithTx.push(keys[index]);
         }
     });
-    const signedTxs = await wallet.signAllTransactions(txsToSign.filter((tx) => tx !== undefined));
+    const signedTxs = await wallet.signAllTransactions(txsToSign
+        .map((tx) => {
+        return tx;
+    })
+        .filter((tx) => tx !== undefined));
     signedTxs.forEach((signedTx, index) => {
         signedTxMap[keysWithTx[index]] = signedTx;
     });

package/lib/user.d.ts

@@ -346,16 +346,6 @@ export declare class User {
      */
     accountLeverageRatioAfterTrade(targetMarketIndex: number, targetMarketType: MarketType, tradeQuoteAmount: BN, tradeSide: PositionDirection, includeOpenOrders?: boolean): BN;
     getUserFeeTier(marketType: MarketType, now?: BN): import("./types").FeeTier;
-    /**
-     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
-     * @param marketType
-     * @param positionMarketIndex
-     * @returns : {takerFee: number, makerFee: number} Precision None
-     */
-    getMarketFees(marketType: MarketType, marketIndex?: number): {
-        takerFee: number;
-        makerFee: number;
-    };
     /**
      * Calculates how much perp fee will be taken for a given sized trade
      * @param quoteAmount

package/lib/user.js

@@ -22,7 +22,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -33,7 +33,10 @@ class User {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
         else {
-            this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs, (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.commitment);
+            this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, {
+                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+            }, (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
@@ -1709,32 +1712,6 @@ class User {
         }
         return state.spotFeeStructure.feeTiers[feeTierIndex];
     }
-    /**
-     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
-     * @param marketType
-     * @param positionMarketIndex
-     * @returns : {takerFee: number, makerFee: number} Precision None
-     */
-    getMarketFees(marketType, marketIndex) {
-        const feeTier = this.getUserFeeTier(marketType);
-        let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
-        let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
-        if (marketIndex !== undefined) {
-            let marketAccount = null;
-            if ((0, types_1.isVariant)(marketType, 'perp')) {
-                marketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
-            }
-            else {
-                marketAccount = this.driftClient.getSpotMarketAccount(marketIndex);
-            }
-            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
-            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
-        }
-        return {
-            takerFee,
-            makerFee,
-        };
-    }
     /**
      * Calculates how much perp fee will be taken for a given sized trade
      * @param quoteAmount
@@ -1742,7 +1719,7 @@ class User {
      */
     calculateFeeForQuoteAmount(quoteAmount, marketIndex) {
         if (marketIndex !== undefined) {
-            const takerFeeMultiplier = this.getMarketFees(_1.MarketType.PERP, marketIndex).takerFee;
+            const takerFeeMultiplier = this.driftClient.getMarketFees(_1.MarketType.PERP, marketIndex, this).takerFee;
             const feeAmountNum = _1.BigNum.from(quoteAmount, numericConstants_1.QUOTE_PRECISION_EXP).toNum() *
                 takerFeeMultiplier;
             return _1.BigNum.fromPrint(feeAmountNum.toString(), numericConstants_1.QUOTE_PRECISION_EXP).val;

package/lib/userConfig.d.ts

@@ -10,6 +10,7 @@ export type UserConfig = {
 export type UserSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
     commitment?: Commitment;
 } | {
     type: 'polling';

package/lib/userMap/WebsocketSubscription.d.ts

@@ -2,19 +2,20 @@
 import { UserMap } from './userMap';
 import { UserAccount } from '../types';
 import { Commitment } from '@solana/web3.js';
+import { ResubOpts } from '../accounts/types';
 export declare class WebsocketSubscription {
     private userMap;
     private commitment;
     private skipInitialLoad;
-    private resubTimeoutMs?;
+    private resubOpts?;
     private includeIdle?;
     private decodeFn;
     private subscriber;
-    constructor({ userMap, commitment, skipInitialLoad, resubTimeoutMs, includeIdle, decodeFn, }: {
+    constructor({ userMap, commitment, skipInitialLoad, resubOpts, includeIdle, decodeFn, }: {
         userMap: UserMap;
         commitment: Commitment;
         skipInitialLoad?: boolean;
-        resubTimeoutMs?: number;
+        resubOpts?: ResubOpts;
         includeIdle?: boolean;
         decodeFn: (name: string, data: Buffer) => UserAccount;
     });

package/lib/userMap/WebsocketSubscription.js

@@ -4,11 +4,11 @@ exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ userMap, commitment, skipInitialLoad = false, resubTimeoutMs, includeIdle = false, decodeFn, }) {
+    constructor({ userMap, commitment, skipInitialLoad = false, resubOpts, includeIdle = false, decodeFn, }) {
         this.userMap = userMap;
         this.commitment = commitment;
         this.skipInitialLoad = skipInitialLoad;
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = resubOpts;
         this.includeIdle = includeIdle || false;
         this.decodeFn = decodeFn;
     }
@@ -21,7 +21,7 @@ class WebsocketSubscription {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'User', this.userMap.driftClient.program, this.decodeFn, {
                 filters,
                 commitment: this.commitment,
-            }, this.resubTimeoutMs);
+            }, this.resubOpts);
         }
         await this.subscriber.subscribe((accountId, account, context) => {
             const userKey = accountId.toBase58();

package/lib/userMap/userMap.js

@@ -56,7 +56,10 @@ class UserMap {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 userMap: this,
                 commitment: this.commitment,
-                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                resubOpts: {
+                    resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                    logResubMessages: config.subscriptionConfig.logResubMessages,
+                },
                 skipInitialLoad: config.skipInitialLoad,
                 decodeFn,
             });

package/lib/userMap/userMapConfig.d.ts

@@ -13,6 +13,7 @@ export type UserMapConfig = {
     } | {
         type: 'websocket';
         resubTimeoutMs?: number;
+        logResubMessages?: boolean;
         commitment?: Commitment;
     };
     skipInitialLoad?: boolean;

package/lib/userStats.js

@@ -7,17 +7,20 @@ const webSocketUserStatsAccountSubsriber_1 = require("./accounts/webSocketUserSt
 const pda_1 = require("./addresses/pda");
 class UserStats {
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.driftClient = config.driftClient;
         this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
         }
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'websocket') {
-            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, config.accountSubscription.resubTimeoutMs, config.accountSubscription.commitment);
+            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, {
+                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+            }, config.accountSubscription.commitment);
         }
         else {
-            throw new Error(`Unknown user stats account subscription type: ${(_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type}`);
+            throw new Error(`Unknown user stats account subscription type: ${(_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type}`);
         }
     }
     async subscribe(userStatsAccount) {

package/lib/userStatsConfig.d.ts

@@ -9,6 +9,7 @@ export type UserStatsConfig = {
 export type UserStatsSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
     commitment?: Commitment;
 } | {
     type: 'polling';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.82.0-beta.1",
+	"version": "2.82.0-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -39,7 +39,7 @@
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.3.7",
-		"@solana/web3.js": "1.73.2",
+		"@solana/web3.js": "1.91.7",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2",
 		"zstddec": "^0.1.0"
@@ -66,6 +66,6 @@
 	},
 	"description": "SDK for Drift Protocol",
 	"engines": {
-		"node": ">=12"
+		"node": ">=18"
 	}
 }

package/src/accounts/types.ts

@@ -184,6 +184,11 @@ export type DataAndSlot<T> = {
 	slot: number;
 };
 
+export type ResubOpts = {
+	resubTimeoutMs?: number;
+	logResubMessages?: boolean;
+};
+
 export interface UserStatsAccountEvents {
 	userStatsAccountUpdate: (payload: UserStatsAccount) => void;
 	update: void;

package/src/accounts/webSocketAccountSubscriber.ts

@@ -1,4 +1,9 @@
-import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
+import {
+	DataAndSlot,
+	BufferAndSlot,
+	AccountSubscriber,
+	ResubOpts,
+} from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
 import { capitalize } from './utils';
@@ -13,7 +18,9 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	decodeBufferFn: (buffer: Buffer) => T;
 	onChange: (data: T) => void;
 	listenerId?: number;
-	resubTimeoutMs?: number;
+
+	resubOpts?: ResubOpts;
+
 	commitment?: Commitment;
 	isUnsubscribing = false;
 
@@ -26,15 +33,15 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		program: Program,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
-		resubTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.accountName = accountName;
 		this.program = program;
 		this.accountPublicKey = accountPublicKey;
 		this.decodeBufferFn = decodeBuffer;
-		this.resubTimeoutMs = resubTimeoutMs;
-		if (this.resubTimeoutMs < 1000) {
+		this.resubOpts = resubOpts;
+		if (this.resubOpts?.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -57,7 +64,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		this.listenerId = this.program.provider.connection.onAccountChange(
 			this.accountPublicKey,
 			(accountInfo, context) => {
-				if (this.resubTimeoutMs) {
+				if (this.resubOpts?.resubTimeoutMs) {
 					this.receivingData = true;
 					clearTimeout(this.timeoutId);
 					this.handleRpcResponse(context, accountInfo);
@@ -69,7 +76,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			this.commitment
 		);
 
-		if (this.resubTimeoutMs) {
+		if (this.resubOpts?.resubTimeoutMs) {
 			this.receivingData = true;
 			this.setTimeout();
 		}
@@ -91,21 +98,26 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(async () => {
-			if (this.isUnsubscribing) {
-				// If we are in the process of unsubscribing, do not attempt to resubscribe
-				return;
-			}
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					// If we are in the process of unsubscribing, do not attempt to resubscribe
+					return;
+				}
 
-			if (this.receivingData) {
-				console.log(
-					`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`
-				);
-				await this.unsubscribe(true);
-				this.receivingData = false;
-				await this.subscribe(this.onChange);
-			}
-		}, this.resubTimeoutMs);
+				if (this.receivingData) {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`
+						);
+					}
+					await this.unsubscribe(true);
+					this.receivingData = false;
+					await this.subscribe(this.onChange);
+				}
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
 	}
 
 	async fetch(): Promise<void> {
@@ -172,7 +184,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 
 	unsubscribe(onResub = false): Promise<void> {
 		if (!onResub) {
-			this.resubTimeoutMs = undefined;
+			this.resubOpts.resubTimeoutMs = undefined;
 		}
 		this.isUnsubscribing = true;
 		clearTimeout(this.timeoutId);

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -2,6 +2,7 @@ import {
 	DriftClientAccountSubscriber,
 	DriftClientAccountEvents,
 	DataAndSlot,
+	ResubOpts,
 } from './types';
 import { AccountSubscriber, NotSubscribedError } from './types';
 import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
@@ -32,7 +33,7 @@ export class WebSocketDriftClientAccountSubscriber
 	oracleInfos: OracleInfo[];
 	oracleClientCache = new OracleClientCache();
 
-	resubTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	shouldFindAllMarketsAndOracles: boolean;
 
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
@@ -59,7 +60,7 @@ export class WebSocketDriftClientAccountSubscriber
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],
 		shouldFindAllMarketsAndOracles: boolean,
-		resubTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
@@ -69,7 +70,7 @@ export class WebSocketDriftClientAccountSubscriber
 		this.spotMarketIndexes = spotMarketIndexes;
 		this.oracleInfos = oracleInfos;
 		this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
-		this.resubTimeoutMs = resubTimeoutMs;
+		this.resubOpts = resubOpts;
 		this.commitment = commitment;
 	}
 
@@ -152,7 +153,7 @@ export class WebSocketDriftClientAccountSubscriber
 			this.program,
 			perpMarketPublicKey,
 			undefined,
-			this.resubTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 		await accountSubscriber.subscribe((data: PerpMarketAccount) => {
@@ -180,7 +181,7 @@ export class WebSocketDriftClientAccountSubscriber
 			this.program,
 			marketPublicKey,
 			undefined,
-			this.resubTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 		await accountSubscriber.subscribe((data: SpotMarketAccount) => {
@@ -214,7 +215,7 @@ export class WebSocketDriftClientAccountSubscriber
 			(buffer: Buffer) => {
 				return client.getOraclePriceDataFromBuffer(buffer);
 			},
-			this.resubTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 

package/src/accounts/webSocketInsuranceFundStakeAccountSubscriber.ts

@@ -16,7 +16,7 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 	implements InsuranceFundStakeAccountSubscriber
 {
 	isSubscribed: boolean;
-	reconnectTimeoutMs?: number;
+	resubTimeoutMs?: number;
 	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<
@@ -30,7 +30,7 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 	public constructor(
 		program: Program,
 		insuranceFundStakeAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number,
+		resubTimeoutMs?: number,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
@@ -38,7 +38,7 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 		this.insuranceFundStakeAccountPublicKey =
 			insuranceFundStakeAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
-		this.reconnectTimeoutMs = reconnectTimeoutMs;
+		this.resubTimeoutMs = resubTimeoutMs;
 		this.commitment = commitment;
 	}
 
@@ -55,7 +55,9 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 				this.program,
 				this.insuranceFundStakeAccountPublicKey,
 				undefined,
-				this.reconnectTimeoutMs,
+				{
+					resubTimeoutMs: this.resubTimeoutMs,
+				},
 				this.commitment
 			);
 

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -1,4 +1,9 @@
-import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import {
+	DataAndSlot,
+	BufferAndSlot,
+	ProgramAccountSubscriber,
+	ResubOpts,
+} from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import {
 	Commitment,
@@ -25,7 +30,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		buffer: Buffer
 	) => void;
 	listenerId?: number;
-	resubTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	isUnsubscribing = false;
 	timeoutId?: NodeJS.Timeout;
 	options: { filters: MemcmpFilter[]; commitment?: Commitment };
@@ -40,14 +45,14 @@ export class WebSocketProgramAccountSubscriber<T>
 		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
 			filters: [],
 		},
-		resubTimeoutMs?: number
+		resubOpts?: ResubOpts
 	) {
 		this.subscriptionName = subscriptionName;
 		this.accountDiscriminator = accountDiscriminator;
 		this.program = program;
 		this.decodeBuffer = decodeBufferFn;
-		this.resubTimeoutMs = resubTimeoutMs;
-		if (this.resubTimeoutMs < 1000) {
+		this.resubOpts = resubOpts;
+		if (this.resubOpts?.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -73,7 +78,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		this.listenerId = this.program.provider.connection.onProgramAccountChange(
 			this.program.programId,
 			(keyedAccountInfo, context) => {
-				if (this.resubTimeoutMs) {
+				if (this.resubOpts?.resubTimeoutMs) {
 					this.receivingData = true;
 					clearTimeout(this.timeoutId);
 					this.handleRpcResponse(context, keyedAccountInfo);
@@ -87,7 +92,7 @@ export class WebSocketProgramAccountSubscriber<T>
 			this.options.filters
 		);
 
-		if (this.resubTimeoutMs) {
+		if (this.resubOpts?.resubTimeoutMs) {
 			this.receivingData = true;
 			this.setTimeout();
 		}
@@ -97,21 +102,26 @@ export class WebSocketProgramAccountSubscriber<T>
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(async () => {
-			if (this.isUnsubscribing) {
-				// If we are in the process of unsubscribing, do not attempt to resubscribe
-				return;
-			}
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					// If we are in the process of unsubscribing, do not attempt to resubscribe
+					return;
+				}
 
-			if (this.receivingData) {
-				console.log(
-					`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`
-				);
-				await this.unsubscribe(true);
-				this.receivingData = false;
-				await this.subscribe(this.onChange);
-			}
-		}, this.resubTimeoutMs);
+				if (this.receivingData) {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
+						);
+					}
+					await this.unsubscribe(true);
+					this.receivingData = false;
+					await this.subscribe(this.onChange);
+				}
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
 	}
 
 	handleRpcResponse(
@@ -163,7 +173,7 @@ export class WebSocketProgramAccountSubscriber<T>
 
 	unsubscribe(onResub = false): Promise<void> {
 		if (!onResub) {
-			this.resubTimeoutMs = undefined;
+			this.resubOpts.resubTimeoutMs = undefined;
 		}
 		this.isUnsubscribing = true;
 		clearTimeout(this.timeoutId);

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -4,6 +4,7 @@ import {
 	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
+	ResubOpts,
 } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -14,7 +15,7 @@ import { UserAccount } from '../types';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
-	reconnectTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
@@ -25,14 +26,14 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	public constructor(
 		program: Program,
 		userAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
+		this.resubOpts = resubOpts;
 		this.userAccountPublicKey = userAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
-		this.reconnectTimeoutMs = reconnectTimeoutMs;
 		this.commitment = commitment;
 	}
 
@@ -46,7 +47,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			this.program,
 			this.userAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -4,6 +4,7 @@ import {
 	NotSubscribedError,
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
+	ResubOpts,
 } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -16,7 +17,7 @@ export class WebSocketUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber
 {
 	isSubscribed: boolean;
-	reconnectTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
@@ -27,14 +28,14 @@ export class WebSocketUserStatsAccountSubscriber
 	public constructor(
 		program: Program,
 		userStatsAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.userStatsAccountPublicKey = userStatsAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
-		this.reconnectTimeoutMs = reconnectTimeoutMs;
+		this.resubOpts = resubOpts;
 		this.commitment = commitment;
 	}
 
@@ -48,7 +49,7 @@ export class WebSocketUserStatsAccountSubscriber
 			this.program,
 			this.userStatsAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);