@drift-labs/sdk 2.79.0-beta.0 → 2.79.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.79.0-beta.0
+2.79.0-beta.2

package/lib/events/eventSubscriber.d.ts

@@ -20,6 +20,7 @@ export declare class EventSubscriber {
     private lastSeenBlockTime;
     lastSeenTxSig: string;
     constructor(connection: Connection, program: Program, options?: EventSubscriptionOptions);
+    private populateInitialEventListMap;
     subscribe(): Promise<boolean>;
     private handleTxLogs;
     fetchPreviousTx(fetchMax?: boolean): Promise<void>;

package/lib/events/eventSubscriber.js

@@ -22,9 +22,6 @@ class EventSubscriber {
         this.address = (_a = this.options.address) !== null && _a !== void 0 ? _a : program.programId;
         this.txEventCache = new txEventCache_1.TxEventCache(this.options.maxTx);
         this.eventListMap = new Map();
-        for (const eventType of this.options.eventTypes) {
-            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir), this.options.orderDir));
-        }
         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.options.logProviderConfig.resubTimeoutMs);
@@ -33,11 +30,17 @@ class EventSubscriber {
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);
         }
     }
+    populateInitialEventListMap() {
+        for (const eventType of this.options.eventTypes) {
+            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir), this.options.orderDir));
+        }
+    }
     async subscribe() {
         try {
             if (this.logProvider.isSubscribed()) {
                 return true;
             }
+            this.populateInitialEventListMap();
             if (this.options.logProviderConfig.type === 'websocket') {
                 if (this.options.logProviderConfig.resubTimeoutMs) {
                     if (this.options.logProviderConfig.maxReconnectAttempts &&
@@ -117,6 +120,10 @@ class EventSubscriber {
         }
     }
     async unsubscribe() {
+        this.eventListMap.clear();
+        this.txEventCache.clear();
+        this.awaitTxPromises.clear();
+        this.awaitTxResolver.clear();
         return await this.logProvider.unsubscribe(true);
     }
     parseEventsFromLogs(txSig, slot, logs) {

package/lib/orderSubscriber/OrderSubscriber.js

@@ -152,6 +152,7 @@ class OrderSubscriber {
         return (_a = this.mostRecentSlot) !== null && _a !== void 0 ? _a : 0;
     }
     async unsubscribe() {
+        this.usersAccounts.clear();
         await this.subscription.unsubscribe();
     }
 }

package/package.json

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

package/src/events/eventSubscriber.ts

@@ -41,18 +41,8 @@ export class EventSubscriber {
 		this.address = this.options.address ?? program.programId;
 		this.txEventCache = new TxEventCache(this.options.maxTx);
 		this.eventListMap = new Map<EventType, EventList<EventType>>();
-		for (const eventType of this.options.eventTypes) {
-			this.eventListMap.set(
-				eventType,
-				new EventList(
-					eventType,
-					this.options.maxEventsPerType,
-					getSortFn(this.options.orderBy, this.options.orderDir),
-					this.options.orderDir
-				)
-			);
-		}
 		this.eventEmitter = new EventEmitter();
+
 		if (this.options.logProviderConfig.type === 'websocket') {
 			this.logProvider = new WebSocketLogProvider(
 				this.connection,
@@ -71,12 +61,28 @@ export class EventSubscriber {
 		}
 	}
 
+	private populateInitialEventListMap() {
+		for (const eventType of this.options.eventTypes) {
+			this.eventListMap.set(
+				eventType,
+				new EventList(
+					eventType,
+					this.options.maxEventsPerType,
+					getSortFn(this.options.orderBy, this.options.orderDir),
+					this.options.orderDir
+				)
+			);
+		}
+	}
+
 	public async subscribe(): Promise<boolean> {
 		try {
 			if (this.logProvider.isSubscribed()) {
 				return true;
 			}
 
+			this.populateInitialEventListMap();
+
 			if (this.options.logProviderConfig.type === 'websocket') {
 				if (this.options.logProviderConfig.resubTimeoutMs) {
 					if (
@@ -203,6 +209,11 @@ export class EventSubscriber {
 	}
 
 	public async unsubscribe(): Promise<boolean> {
+		this.eventListMap.clear();
+		this.txEventCache.clear();
+		this.awaitTxPromises.clear();
+		this.awaitTxResolver.clear();
+
 		return await this.logProvider.unsubscribe(true);
 	}
 

package/src/orderSubscriber/OrderSubscriber.ts

@@ -229,6 +229,7 @@ export class OrderSubscriber {
 	}
 
 	public async unsubscribe(): Promise<void> {
+		this.usersAccounts.clear();
 		await this.subscription.unsubscribe();
 	}
 }