@drift-labs/sdk 2.40.0-beta.6 → 2.40.0-beta.8

package/VERSION

@@ -1 +1 @@
-2.40.0-beta.6
+2.40.0-beta.8

package/lib/accounts/types.d.ts

@@ -3,7 +3,7 @@
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
 export interface AccountSubscriber<T> {
@@ -13,6 +13,10 @@ export interface AccountSubscriber<T> {
     unsubscribe(): Promise<void>;
     setData(userAccount: T, slot?: number): void;
 }
+export interface ProgramAccountSubscriber<T> {
+    subscribe(onChange: (accountId: PublicKey, data: T, context: Context) => void): Promise<void>;
+    unsubscribe(): Promise<void>;
+}
 export declare class NotSubscribedError extends Error {
     name: string;
 }

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
@@ -11,9 +12,13 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     decodeBufferFn: (buffer: Buffer) => T;
     onChange: (data: T) => void;
     listenerId?: number;
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T);
+    resubTimeoutMs?: number;
+    timeoutId?: NodeJS.Timeout;
+    receivingData: boolean;
+    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
+    private setTimeout;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
-    constructor(accountName, program, accountPublicKey, decodeBuffer) {
+    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs) {
         this.accountName = accountName;
         this.program = program;
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.receivingData = false;
     }
     async subscribe(onChange) {
         if (this.listenerId) {
@@ -18,8 +20,19 @@ class WebSocketAccountSubscriber {
             await this.fetch();
         }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
-            this.handleRpcResponse(context, accountInfo);
+            if (this.resubTimeoutMs) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.handleRpcResponse(context, accountInfo);
+                this.setTimeout();
+            }
+            else {
+                this.handleRpcResponse(context, accountInfo);
+            }
         }, this.program.provider.opts.commitment);
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
     }
     setData(data, slot) {
         const newSlot = slot || 0;
@@ -31,6 +44,19 @@ class WebSocketAccountSubscriber {
             slot,
         };
     }
+    setTimeout() {
+        if (!this.onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        this.timeoutId = setTimeout(async () => {
+            if (this.receivingData) {
+                console.log(`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                await this.subscribe(this.onChange);
+            }
+        }, this.resubTimeoutMs);
+    }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
         this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -15,6 +15,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
+    resubTimeoutMs?: number;
     shouldFindAllMarketsAndOracles: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
@@ -24,7 +25,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubTimeoutMs?: number);
     subscribe(): Promise<boolean>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -10,7 +10,7 @@ const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 class WebSocketDriftClientAccountSubscriber {
-    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.spotMarketAccountSubscribers = new Map();
@@ -23,6 +23,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -43,7 +44,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
-        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
+        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey, undefined, this.resubTimeoutMs);
         await this.stateAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -68,7 +69,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -84,7 +85,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -104,7 +105,7 @@ class WebSocketDriftClientAccountSubscriber {
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
-        });
+        }, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import { Program } from '@coral-xyz/anchor';
+import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
+export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {
+    subscriptionName: string;
+    accountDiscriminator: string;
+    dataAndSlot?: DataAndSlot<T> & {
+        accountId: PublicKey;
+    };
+    bufferAndSlot?: BufferAndSlot;
+    program: Program;
+    decodeBuffer: (accountName: string, ix: Buffer) => T;
+    onChange: (accountId: PublicKey, data: T, context: Context) => void;
+    listenerId?: number;
+    resubTimeoutMs?: number;
+    timeoutId?: NodeJS.Timeout;
+    options: {
+        filters: MemcmpFilter[];
+        commitment?: Commitment;
+    };
+    receivingData: boolean;
+    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
+        filters: MemcmpFilter[];
+        commitment?: Commitment;
+    }, resubTimeoutMs?: number);
+    subscribe(onChange: (accountId: PublicKey, data: T, context: Context) => void): Promise<void>;
+    private setTimeout;
+    handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;
+    unsubscribe(): Promise<void>;
+}

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketProgramAccountSubscriber = void 0;
+class WebSocketProgramAccountSubscriber {
+    constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
+        filters: [],
+    }, resubTimeoutMs) {
+        this.receivingData = false;
+        this.subscriptionName = subscriptionName;
+        this.accountDiscriminator = accountDiscriminator;
+        this.program = program;
+        this.decodeBuffer = decodeBufferFn;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.options = options;
+        this.receivingData = false;
+    }
+    async subscribe(onChange) {
+        var _a;
+        if (this.listenerId) {
+            return;
+        }
+        this.onChange = onChange;
+        this.listenerId = this.program.provider.connection.onProgramAccountChange(this.program.programId, (keyedAccountInfo, context) => {
+            if (this.resubTimeoutMs) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.handleRpcResponse(context, keyedAccountInfo);
+                this.setTimeout();
+            }
+            else {
+                this.handleRpcResponse(context, keyedAccountInfo);
+            }
+        }, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : this.program.provider.opts.commitment, this.options.filters);
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
+    }
+    setTimeout() {
+        if (!this.onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        this.timeoutId = setTimeout(async () => {
+            if (this.receivingData) {
+                console.log(`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                await this.subscribe(this.onChange);
+            }
+        }, this.resubTimeoutMs);
+    }
+    handleRpcResponse(context, keyedAccountInfo) {
+        const newSlot = context.slot;
+        let newBuffer = undefined;
+        if (keyedAccountInfo) {
+            newBuffer = keyedAccountInfo.accountInfo.data;
+        }
+        if (!this.bufferAndSlot) {
+            this.bufferAndSlot = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            if (newBuffer) {
+                const account = this.decodeBuffer(this.accountDiscriminator, newBuffer);
+                this.dataAndSlot = {
+                    data: account,
+                    slot: newSlot,
+                    accountId: keyedAccountInfo.accountId,
+                };
+                this.onChange(keyedAccountInfo.accountId, account, context);
+            }
+            return;
+        }
+        if (newSlot <= this.bufferAndSlot.slot) {
+            return;
+        }
+        const oldBuffer = this.bufferAndSlot.buffer;
+        if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+            this.bufferAndSlot = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            const account = this.decodeBuffer(this.accountDiscriminator, newBuffer);
+            this.dataAndSlot = {
+                data: account,
+                slot: newSlot,
+                accountId: keyedAccountInfo.accountId,
+            };
+            this.onChange(keyedAccountInfo.accountId, account, context);
+        }
+    }
+    unsubscribe() {
+        if (this.listenerId) {
+            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
+            this.listenerId = undefined;
+            return promise;
+        }
+    }
+}
+exports.WebSocketProgramAccountSubscriber = WebSocketProgramAccountSubscriber;

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -7,11 +7,12 @@ import { PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
+    reconnectTimeoutMs?: number;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey);
+    constructor(program: Program, userAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -5,17 +5,18 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, userAccountPublicKey) {
+    constructor(program, userAccountPublicKey, reconnectTimeoutMs) {
         this.isSubscribed = false;
         this.program = program;
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
+        this.reconnectTimeoutMs = reconnectTimeoutMs;
     }
     async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.reconnectTimeoutMs);
         if (userAccount) {
             this.userDataAccountSubscriber.setData(userAccount);
         }

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -7,11 +7,12 @@ import { PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
+    reconnectTimeoutMs?: number;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey);
+    constructor(program: Program, userStatsAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,17 +5,18 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
-    constructor(program, userStatsAccountPublicKey) {
+    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs) {
         this.isSubscribed = false;
         this.program = program;
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
+        this.reconnectTimeoutMs = reconnectTimeoutMs;
     }
     async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey);
+        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.reconnectTimeoutMs);
         if (userStatsAccount) {
             this.userStatsAccountSubscriber.setData(userStatsAccount);
         }

package/lib/auctionSubscriber/auctionSubscriber.d.ts

@@ -5,9 +5,10 @@ import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
     private driftClient;
     private opts;
+    private resubTimeoutMs?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-    private websocketId;
-    constructor({ driftClient, opts }: AuctionSubscriberConfig);
+    private subscriber;
+    constructor({ driftClient, opts, resubTimeoutMs }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -3,22 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuctionSubscriber = void 0;
 const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    constructor({ driftClient, opts }) {
+    constructor({ driftClient, opts, resubTimeoutMs }) {
         this.driftClient = driftClient;
         this.opts = opts || this.driftClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
+        this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
-        this.websocketId = this.driftClient.connection.onProgramAccountChange(this.driftClient.program.programId, (keyAccountInfo, context) => {
-            const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', keyAccountInfo.accountInfo.data);
-            this.eventEmitter.emit('onAccountUpdate', userAccount, keyAccountInfo.accountId, context.slot);
-        }, this.driftClient.opts.commitment, [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()]);
+        if (!this.subscriber) {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'User', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
+                filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
+                commitment: this.driftClient.opts.commitment,
+            }, this.resubTimeoutMs);
+        }
+        await this.subscriber.subscribe((accountId, data, context) => {
+            this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);
+        });
     }
     async unsubscribe() {
-        if (this.websocketId) {
-            await this.driftClient.connection.removeProgramAccountChangeListener(this.websocketId);
+        if (!this.subscriber) {
+            return;
         }
+        this.subscriber.unsubscribe();
     }
 }
 exports.AuctionSubscriber = AuctionSubscriber;

package/lib/auctionSubscriber/types.d.ts

@@ -4,6 +4,7 @@ import { ConfirmOptions, PublicKey } from '@solana/web3.js';
 export type AuctionSubscriberConfig = {
     driftClient: DriftClient;
     opts?: ConfirmOptions;
+    resubTimeoutMs?: number;
 };
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;

package/lib/driftClient.js

@@ -66,7 +66,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -139,11 +139,11 @@ class DriftClient {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_o = config.perpMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.spotMarketIndexes) !== null && _p !== void 0 ? _p : [], (_q = config.oracleInfos) !== null && _q !== void 0 ? _q : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_r = config.perpMarketIndexes) !== null && _r !== void 0 ? _r : [], (_s = config.spotMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.oracleInfos) !== null && _t !== void 0 ? _t : [], noMarketsAndOraclesSpecified);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_r = config.perpMarketIndexes) !== null && _r !== void 0 ? _r : [], (_s = config.spotMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.oracleInfos) !== null && _t !== void 0 ? _t : [], noMarketsAndOraclesSpecified, (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender =
-            (_u = config.txSender) !== null && _u !== void 0 ? _u : new retryTxSender_1.RetryTxSender({
+            (_v = config.txSender) !== null && _v !== void 0 ? _v : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,

package/lib/driftClientConfig.d.ts

@@ -28,6 +28,7 @@ export type DriftClientConfig = {
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';
+    resubTimeoutMs?: number;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
-import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
 import { PollingSubscription } from './PollingSubscription';
@@ -22,7 +20,7 @@ export declare class OrderSubscriber {
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
-    tryUpdateUserAccount(key: string, buffer: Buffer, slot: number): void;
+    tryUpdateUserAccount(key: string, userAccount: UserAccount, slot: number): void;
     getDLOB(slot: number): Promise<DLOB>;
     unsubscribe(): Promise<void>;
 }

package/lib/orderSubscriber/OrderSubscriber.js

@@ -22,6 +22,7 @@ class OrderSubscriber {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
+                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
             });
         }
         this.eventEmitter = new events_1.EventEmitter();
@@ -57,7 +58,8 @@ class OrderSubscriber {
                 // @ts-ignore
                 const buffer = buffer_1.Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
                 programAccountSet.add(key);
-                this.tryUpdateUserAccount(key, buffer, slot);
+                const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
+                this.tryUpdateUserAccount(key, userAccount, slot);
             }
             for (const key of this.usersAccounts.keys()) {
                 if (!programAccountSet.has(key)) {
@@ -73,10 +75,9 @@ class OrderSubscriber {
             this.fetchPromise = undefined;
         }
     }
-    tryUpdateUserAccount(key, buffer, slot) {
+    tryUpdateUserAccount(key, userAccount, slot) {
         const slotAndUserAccount = this.usersAccounts.get(key);
         if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
-            const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
             const newOrders = userAccount.orders.filter((order) => {
                 var _a;
                 return order.slot.toNumber() > ((_a = slotAndUserAccount === null || slotAndUserAccount === void 0 ? void 0 : slotAndUserAccount.slot) !== null && _a !== void 0 ? _a : 0) &&

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -2,10 +2,12 @@ import { OrderSubscriber } from './OrderSubscriber';
 export declare class WebsocketSubscription {
     private orderSubscriber;
     private skipInitialLoad;
-    private websocketId;
-    constructor({ orderSubscriber, skipInitialLoad, }: {
+    private resubTimeoutMs?;
+    private subscriber;
+    constructor({ orderSubscriber, skipInitialLoad, resubTimeoutMs, }: {
         orderSubscriber: OrderSubscriber;
         skipInitialLoad?: boolean;
+        resubTimeoutMs?: number;
     });
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -2,29 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ orderSubscriber, skipInitialLoad = false, }) {
+    constructor({ orderSubscriber, skipInitialLoad = false, resubTimeoutMs, }) {
         this.orderSubscriber = orderSubscriber;
         this.skipInitialLoad = skipInitialLoad;
+        this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
-        if (this.websocketId) {
-            return;
+        if (!this.subscriber) {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.driftClient.program.account.user.coder.accounts.decode.bind(this.orderSubscriber.driftClient.program.account.user.coder.accounts), {
+                filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
+                commitment: this.orderSubscriber.driftClient.opts.commitment,
+            }, this.resubTimeoutMs);
         }
-        this.websocketId =
-            this.orderSubscriber.driftClient.connection.onProgramAccountChange(this.orderSubscriber.driftClient.program.programId, (keyAccountInfo, context) => {
-                const userKey = keyAccountInfo.accountId.toBase58();
-                this.orderSubscriber.tryUpdateUserAccount(userKey, keyAccountInfo.accountInfo.data, context.slot);
-            }, this.orderSubscriber.driftClient.opts.commitment, [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()]);
+        await this.subscriber.subscribe((accountId, account, context) => {
+            const userKey = accountId.toBase58();
+            this.orderSubscriber.tryUpdateUserAccount(userKey, account, context.slot);
+        });
         if (!this.skipInitialLoad) {
             await this.orderSubscriber.fetch();
         }
     }
     async unsubscribe() {
-        if (this.websocketId) {
-            await this.orderSubscriber.driftClient.connection.removeProgramAccountChangeListener(this.websocketId);
-            this.websocketId = undefined;
-        }
+        this.subscriber.unsubscribe();
     }
 }
 exports.WebsocketSubscription = WebsocketSubscription;

package/lib/orderSubscriber/types.d.ts

@@ -9,6 +9,7 @@ export type OrderSubscriberConfig = {
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;
+        resubTimeoutMs?: number;
     };
 };
 export interface OrderSubscriberEvents {

package/lib/user.d.ts

@@ -180,14 +180,14 @@ export declare class User {
      * calculates current user leverage which is (total liability size) / (net asset value)
      * @returns : Precision TEN_THOUSAND
      */
-    getLeverage(): BN;
+    getLeverage(includeOpenOrders?: boolean): BN;
     calculateLeverageFromComponents({ perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue, }: {
         perpLiabilityValue: BN;
         perpPnl: BN;
         spotAssetValue: BN;
         spotLiabilityValue: BN;
     }): BN;
-    getLeverageComponents(): {
+    getLeverageComponents(includeOpenOrders?: boolean): {
         perpLiabilityValue: BN;
         perpPnl: BN;
         spotAssetValue: BN;

package/lib/user.js

@@ -822,8 +822,8 @@ class User {
      * calculates current user leverage which is (total liability size) / (net asset value)
      * @returns : Precision TEN_THOUSAND
      */
-    getLeverage() {
-        return this.calculateLeverageFromComponents(this.getLeverageComponents());
+    getLeverage(includeOpenOrders = true) {
+        return this.calculateLeverageFromComponents(this.getLeverageComponents(includeOpenOrders));
     }
     calculateLeverageFromComponents({ perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue, }) {
         const totalLiabilityValue = perpLiabilityValue.add(spotLiabilityValue);
@@ -834,10 +834,10 @@ class User {
         }
         return totalLiabilityValue.mul(numericConstants_1.TEN_THOUSAND).div(netAssetValue);
     }
-    getLeverageComponents() {
-        const perpLiability = this.getTotalPerpPositionValue(undefined, undefined, true);
+    getLeverageComponents(includeOpenOrders = true) {
+        const perpLiability = this.getTotalPerpPositionValue(undefined, undefined, includeOpenOrders);
         const perpPnl = this.getUnrealizedPNL(true);
-        const { totalAssetValue: spotAssetValue, totalLiabilityValue: spotLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(undefined, undefined, undefined, true);
+        const { totalAssetValue: spotAssetValue, totalLiabilityValue: spotLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(undefined, undefined, undefined, includeOpenOrders);
         return {
             perpLiabilityValue: perpLiability,
             perpPnl,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.40.0-beta.6",
+	"version": "2.40.0-beta.8",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",