@drift-labs/sdk 2.48.0-beta.16 → 2.48.0-beta.18

package/VERSION

@@ -1 +1 @@
-2.48.0-beta.16
+2.48.0-beta.18

package/lib/events/eventSubscriber.js

@@ -27,7 +27,7 @@ class EventSubscriber {
         }
         this.eventEmitter = new events_1.EventEmitter();
         if (this.options.logProviderConfig.type === 'websocket') {
-            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment);
+            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment, this.options.resubTimeoutMs);
         }
         else {
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);

package/lib/events/types.d.ts

@@ -10,6 +10,7 @@ export type EventSubscriptionOptions = {
     maxTx?: number;
     logProviderConfig?: LogProviderConfig;
     untilTx?: TransactionSignature;
+    resubTimeoutMs?: number;
 };
 export declare const DefaultEventSubscriptionOptions: EventSubscriptionOptions;
 export type EventSubscriptionOrderBy = 'blockchain' | 'client';

package/lib/events/webSocketLogProvider.d.ts

@@ -4,9 +4,15 @@ export declare class WebSocketLogProvider implements LogProvider {
     private connection;
     private address;
     private commitment;
+    private resubTimeoutMs?;
     private subscriptionId;
-    constructor(connection: Connection, address: PublicKey, commitment: Commitment);
+    private isUnsubscribing;
+    private receivingData;
+    private timeoutId?;
+    private callback?;
+    constructor(connection: Connection, address: PublicKey, commitment: Commitment, resubTimeoutMs?: number);
     subscribe(callback: logProviderCallback): boolean;
     isSubscribed(): boolean;
     unsubscribe(): Promise<boolean>;
+    private setTimeout;
 }

package/lib/events/webSocketLogProvider.js

@@ -2,29 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketLogProvider = void 0;
 class WebSocketLogProvider {
-    constructor(connection, address, commitment) {
+    constructor(connection, address, commitment, resubTimeoutMs) {
         this.connection = connection;
         this.address = address;
         this.commitment = commitment;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.isUnsubscribing = false;
+        this.receivingData = false;
     }
     subscribe(callback) {
         if (this.subscriptionId) {
             return true;
         }
+        this.callback = callback;
         this.subscriptionId = this.connection.onLogs(this.address, (logs, ctx) => {
+            if (this.resubTimeoutMs && !this.isUnsubscribing) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.setTimeout();
+            }
             callback(logs.signature, ctx.slot, logs.logs, undefined);
         }, this.commitment);
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
         return true;
     }
     isSubscribed() {
         return this.subscriptionId !== undefined;
     }
     async unsubscribe() {
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
         if (this.subscriptionId !== undefined) {
-            await this.connection.removeOnLogsListener(this.subscriptionId);
-            this.subscriptionId = undefined;
+            this.connection
+                .removeOnLogsListener(this.subscriptionId)
+                .then(() => {
+                this.subscriptionId = undefined;
+                this.isUnsubscribing = false;
+                return true;
+            })
+                .catch((err) => {
+                console.log('Error unsubscribing from logs: ', err);
+                this.isUnsubscribing = false;
+                return false;
+            });
         }
-        return true;
+        else {
+            this.isUnsubscribing = false;
+            return true;
+        }
+    }
+    setTimeout() {
+        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 log data in ${this.resubTimeoutMs}ms, resubscribing`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                this.subscribe(this.callback);
+            }
+        }, this.resubTimeoutMs);
     }
 }
 exports.WebSocketLogProvider = WebSocketLogProvider;

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
+import { Commitment } from '@solana/web3.js';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
 import { PollingSubscription } from './PollingSubscription';
@@ -14,6 +15,7 @@ export declare class OrderSubscriber {
         userAccount: UserAccount;
     }>;
     subscription: PollingSubscription | WebsocketSubscription;
+    commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;
     fetchPromiseResolver: () => void;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -12,6 +12,7 @@ class OrderSubscriber {
     constructor(config) {
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
+        this.commitment = config.subscriptionConfig.commitment || 'processed';
         if (config.subscriptionConfig.type === 'polling') {
             this.subscription = new PollingSubscription_1.PollingSubscription({
                 orderSubscriber: this,
@@ -21,6 +22,7 @@ class OrderSubscriber {
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
+                commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
             });
@@ -41,7 +43,7 @@ class OrderSubscriber {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
-                    commitment: this.driftClient.opts.commitment,
+                    commitment: this.commitment,
                     filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()],
                     encoding: 'base64',
                     withContext: true,

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -1,11 +1,14 @@
 import { OrderSubscriber } from './OrderSubscriber';
+import { Commitment } from '@solana/web3.js';
 export declare class WebsocketSubscription {
     private orderSubscriber;
+    private commitment;
     private skipInitialLoad;
     private resubTimeoutMs?;
     private subscriber;
-    constructor({ orderSubscriber, skipInitialLoad, resubTimeoutMs, }: {
+    constructor({ orderSubscriber, commitment, skipInitialLoad, resubTimeoutMs, }: {
         orderSubscriber: OrderSubscriber;
+        commitment: Commitment;
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
     });

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -4,8 +4,9 @@ exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ orderSubscriber, skipInitialLoad = false, resubTimeoutMs, }) {
+    constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubTimeoutMs, }) {
         this.orderSubscriber = orderSubscriber;
+        this.commitment = commitment;
         this.skipInitialLoad = skipInitialLoad;
         this.resubTimeoutMs = resubTimeoutMs;
     }
@@ -13,7 +14,7 @@ class WebsocketSubscription {
         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,
+                commitment: this.commitment,
             }, this.resubTimeoutMs);
         }
         await this.subscriber.subscribe((accountId, account, context) => {

package/lib/orderSubscriber/types.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 export type OrderSubscriberConfig = {
@@ -6,10 +6,12 @@ export type OrderSubscriberConfig = {
     subscriptionConfig: {
         type: 'polling';
         frequency: number;
+        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
+        commitment?: Commitment;
     };
 };
 export interface OrderSubscriberEvents {

package/package.json

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

package/src/events/eventSubscriber.ts

@@ -56,7 +56,8 @@ export class EventSubscriber {
 			this.logProvider = new WebSocketLogProvider(
 				this.connection,
 				this.address,
-				this.options.commitment
+				this.options.commitment,
+				this.options.resubTimeoutMs
 			);
 		} else {
 			this.logProvider = new PollingLogProvider(

package/src/events/types.ts

@@ -28,6 +28,7 @@ export type EventSubscriptionOptions = {
 	// when the subscription starts, client might want to backtrack and fetch old tx's
 	// this specifies how far to backtrack
 	untilTx?: TransactionSignature;
+	resubTimeoutMs?: number;
 };
 
 export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {

package/src/events/webSocketLogProvider.ts

@@ -3,10 +3,15 @@ import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 
 export class WebSocketLogProvider implements LogProvider {
 	private subscriptionId: number;
+	private isUnsubscribing = false;
+	private receivingData = false;
+	private timeoutId?: NodeJS.Timeout;
+	private callback?: logProviderCallback;
 	public constructor(
 		private connection: Connection,
 		private address: PublicKey,
-		private commitment: Commitment
+		private commitment: Commitment,
+		private resubTimeoutMs?: number
 	) {}
 
 	public subscribe(callback: logProviderCallback): boolean {
@@ -14,13 +19,24 @@ export class WebSocketLogProvider implements LogProvider {
 			return true;
 		}
 
+		this.callback = callback;
 		this.subscriptionId = this.connection.onLogs(
 			this.address,
 			(logs, ctx) => {
+				if (this.resubTimeoutMs && !this.isUnsubscribing) {
+					this.receivingData = true;
+					clearTimeout(this.timeoutId);
+					this.setTimeout();
+				}
 				callback(logs.signature, ctx.slot, logs.logs, undefined);
 			},
 			this.commitment
 		);
+
+		if (this.resubTimeoutMs) {
+			this.setTimeout();
+		}
+
 		return true;
 	}
 
@@ -29,10 +45,41 @@ export class WebSocketLogProvider implements LogProvider {
 	}
 
 	public async unsubscribe(): Promise<boolean> {
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+
 		if (this.subscriptionId !== undefined) {
-			await this.connection.removeOnLogsListener(this.subscriptionId);
-			this.subscriptionId = undefined;
+			this.connection
+				.removeOnLogsListener(this.subscriptionId)
+				.then(() => {
+					this.subscriptionId = undefined;
+					this.isUnsubscribing = false;
+					return true;
+				})
+				.catch((err) => {
+					console.log('Error unsubscribing from logs: ', err);
+					this.isUnsubscribing = false;
+					return false;
+				});
+		} else {
+			this.isUnsubscribing = false;
+			return true;
 		}
-		return true;
+	}
+
+	private setTimeout(): void {
+		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 log data in ${this.resubTimeoutMs}ms, resubscribing`);
+				await this.unsubscribe();
+				this.receivingData = false;
+				this.subscribe(this.callback);
+			}
+		}, this.resubTimeoutMs);
 	}
 }

package/src/orderSubscriber/OrderSubscriber.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
 import { getUserFilter, getUserWithOrderFilter } from '../memcmp';
-import { PublicKey, RpcResponseAndContext } from '@solana/web3.js';
+import { Commitment, PublicKey, RpcResponseAndContext } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
@@ -14,6 +14,7 @@ export class OrderSubscriber {
 	driftClient: DriftClient;
 	usersAccounts = new Map<string, { slot: number; userAccount: UserAccount }>();
 	subscription: PollingSubscription | WebsocketSubscription;
+	commitment: Commitment;
 	eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
 
 	fetchPromise?: Promise<void>;
@@ -23,6 +24,7 @@ export class OrderSubscriber {
 
 	constructor(config: OrderSubscriberConfig) {
 		this.driftClient = config.driftClient;
+		this.commitment = config.subscriptionConfig.commitment || 'processed';
 		if (config.subscriptionConfig.type === 'polling') {
 			this.subscription = new PollingSubscription({
 				orderSubscriber: this,
@@ -31,6 +33,7 @@ export class OrderSubscriber {
 		} else {
 			this.subscription = new WebsocketSubscription({
 				orderSubscriber: this,
+				commitment: this.commitment,
 				skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
 				resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
 			});
@@ -55,7 +58,7 @@ export class OrderSubscriber {
 			const rpcRequestArgs = [
 				this.driftClient.program.programId.toBase58(),
 				{
-					commitment: this.driftClient.opts.commitment,
+					commitment: this.commitment,
 					filters: [getUserFilter(), getUserWithOrderFilter()],
 					encoding: 'base64',
 					withContext: true,

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -2,10 +2,11 @@ import { OrderSubscriber } from './OrderSubscriber';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
 import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
-import { Context, PublicKey } from '@solana/web3.js';
+import { Commitment, Context, PublicKey } from '@solana/web3.js';
 
 export class WebsocketSubscription {
 	private orderSubscriber: OrderSubscriber;
+	private commitment: Commitment;
 	private skipInitialLoad: boolean;
 	private resubTimeoutMs?: number;
 
@@ -13,14 +14,17 @@ export class WebsocketSubscription {
 
 	constructor({
 		orderSubscriber,
+		commitment,
 		skipInitialLoad = false,
 		resubTimeoutMs,
 	}: {
 		orderSubscriber: OrderSubscriber;
+		commitment: Commitment;
 		skipInitialLoad?: boolean;
 		resubTimeoutMs?: number;
 	}) {
 		this.orderSubscriber = orderSubscriber;
+		this.commitment = commitment;
 		this.skipInitialLoad = skipInitialLoad;
 		this.resubTimeoutMs = resubTimeoutMs;
 	}
@@ -36,7 +40,7 @@ export class WebsocketSubscription {
 				),
 				{
 					filters: [getUserFilter(), getNonIdleUserFilter()],
-					commitment: this.orderSubscriber.driftClient.opts.commitment,
+					commitment: this.commitment,
 				},
 				this.resubTimeoutMs
 			);

package/src/orderSubscriber/types.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 
@@ -8,11 +8,13 @@ export type OrderSubscriberConfig = {
 		| {
 				type: 'polling';
 				frequency: number;
+				commitment?: Commitment;
 		  }
 		| {
 				type: 'websocket';
 				skipInitialLoad?: boolean;
 				resubTimeoutMs?: number;
+				commitment?: Commitment;
 		  };
 };