@drift-labs/sdk 2.48.0-beta.15 → 2.48.0-beta.17

package/VERSION

@@ -1 +1 @@
-2.48.0-beta.15
+2.48.0-beta.17

package/lib/accounts/bulkAccountLoader.js

@@ -139,7 +139,7 @@ class BulkAccountLoader {
             accountsToLoad.forEach((accountToLoad, j) => {
                 const key = accountToLoad.publicKey.toBase58();
                 const oldRPCResponse = this.bufferAndSlotMap.get(key);
-                if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
+                if (oldRPCResponse && newSlot < oldRPCResponse.slot) {
                     return;
                 }
                 let newBuffer = undefined;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -89,7 +89,7 @@ class WebSocketAccountSubscriber {
             }
             return;
         }
-        if (newSlot <= this.bufferAndSlot.slot) {
+        if (newSlot < this.bufferAndSlot.slot) {
             return;
         }
         const oldBuffer = this.bufferAndSlot.buffer;

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -75,7 +75,7 @@ class WebSocketProgramAccountSubscriber {
             }
             return;
         }
-        if (newSlot <= this.bufferAndSlot.slot) {
+        if (newSlot < this.bufferAndSlot.slot) {
             return;
         }
         const oldBuffer = this.bufferAndSlot.buffer;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -51,7 +51,7 @@ class WebSocketUserAccountSubscriber {
     updateData(userAccount, slot) {
         var _a;
         const currentDataSlot = ((_a = this.userDataAccountSubscriber.dataAndSlot) === null || _a === void 0 ? void 0 : _a.slot) || 0;
-        if (currentDataSlot < slot) {
+        if (currentDataSlot <= slot) {
             this.userDataAccountSubscriber.setData(userAccount, slot);
             this.eventEmitter.emit('userAccountUpdate', userAccount);
             this.eventEmitter.emit('update');

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.js

@@ -77,7 +77,7 @@ class OrderSubscriber {
             this.mostRecentSlot = slot;
         }
         const slotAndUserAccount = this.usersAccounts.get(key);
-        if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
+        if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
             let userAccount;
             // Polling leads to a lot of redundant decoding, so we only decode if data is from a fresh slot
             if (dataType === 'raw') {

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -193,7 +193,7 @@ export class BulkAccountLoader {
 				const key = accountToLoad.publicKey.toBase58();
 				const oldRPCResponse = this.bufferAndSlotMap.get(key);
 
-				if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
+				if (oldRPCResponse && newSlot < oldRPCResponse.slot) {
 					return;
 				}
 

package/src/accounts/webSocketAccountSubscriber.ts

@@ -134,7 +134,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			return;
 		}
 
-		if (newSlot <= this.bufferAndSlot.slot) {
+		if (newSlot < this.bufferAndSlot.slot) {
 			return;
 		}
 

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -125,7 +125,7 @@ export class WebSocketProgramAccountSubscriber<T>
 			return;
 		}
 
-		if (newSlot <= this.bufferAndSlot.slot) {
+		if (newSlot < this.bufferAndSlot.slot) {
 			return;
 		}
 

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -94,7 +94,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	public updateData(userAccount: UserAccount, slot: number) {
 		const currentDataSlot =
 			this.userDataAccountSubscriber.dataAndSlot?.slot || 0;
-		if (currentDataSlot < slot) {
+		if (currentDataSlot <= slot) {
 			this.userDataAccountSubscriber.setData(userAccount, slot);
 			this.eventEmitter.emit('userAccountUpdate', userAccount);
 			this.eventEmitter.emit('update');

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

@@ -116,7 +116,7 @@ export class OrderSubscriber {
 		}
 
 		const slotAndUserAccount = this.usersAccounts.get(key);
-		if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
+		if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
 			let userAccount: UserAccount;
 			// Polling leads to a lot of redundant decoding, so we only decode if data is from a fresh slot
 			if (dataType === 'raw') {