@drift-labs/sdk 2.48.0-beta.4 → 2.48.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.48.0-beta.4
+2.48.0-beta.6

package/lib/user.js

@@ -22,7 +22,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -32,7 +32,7 @@ class User {
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'websocket') {
+        else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.resubTimeoutMs, config.accountSubscription.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;

package/lib/userMap/userMap.d.ts

@@ -35,6 +35,7 @@ export declare class UserMap implements UserMapInterface {
      * @param {SyncCallbackCriteria} syncCallbackCriteria - The criteria for the sync callback. Defaults to having no filters
      */
     constructor(driftClient: DriftClient, accountSubscription: UserSubscriptionConfig, includeIdle?: boolean, syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria);
+    addSyncCallback(syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria): void;
     subscribe(): Promise<void>;
     addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount): Promise<void>;
     has(key: string): boolean;
@@ -66,6 +67,7 @@ export declare class UserMap implements UserMapInterface {
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
     size(): number;
+    getUniqueAuthorities(useSyncCallbackCriteria?: boolean): PublicKey[];
     sync(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/userMap/userMap.js

@@ -29,6 +29,10 @@ class UserMap {
         this.syncCallback = syncCallback;
         this.syncCallbackCriteria = syncCallbackCriteria;
     }
+    addSyncCallback(syncCallback, syncCallbackCriteria = { hasOpenOrders: false }) {
+        this.syncCallback = syncCallback;
+        this.syncCallbackCriteria = syncCallbackCriteria;
+    }
     async subscribe() {
         if (this.size() > 0) {
             return;
@@ -144,6 +148,19 @@ class UserMap {
     size() {
         return this.userMap.size;
     }
+    getUniqueAuthorities(useSyncCallbackCriteria = true) {
+        const usersMeetingCriteria = Array.from(this.userMap.values()).filter((user) => {
+            let pass = true;
+            if (useSyncCallbackCriteria &&
+                this.syncCallbackCriteria.hasOpenOrders) {
+                pass = pass && user.getUserAccount().hasOpenOrder;
+            }
+            return pass;
+        });
+        const userAuths = new Set(usersMeetingCriteria.map((user) => user.getUserAccount().authority.toBase58()));
+        const userAuthKeys = Array.from(userAuths).map((userAuth) => new web3_js_1.PublicKey(userAuth));
+        return userAuthKeys;
+    }
     async sync() {
         if (this.syncPromise) {
             return this.syncPromise;
@@ -193,16 +210,7 @@ class UserMap {
                 }
             }
             if (this.syncCallback) {
-                const usersMeetingCriteria = Array.from(this.userMap.values()).filter((user) => {
-                    let pass = true;
-                    if (this.syncCallbackCriteria.hasOpenOrders) {
-                        pass = pass && user.getUserAccount().hasOpenOrder;
-                    }
-                    return pass;
-                });
-                const userAuths = new Set(usersMeetingCriteria.map((user) => user.getUserAccount().authority.toBase58()));
-                const userAuthKeys = Array.from(userAuths).map((userAuth) => new web3_js_1.PublicKey(userAuth));
-                await this.syncCallback(userAuthKeys);
+                await this.syncCallback(this.getUniqueAuthorities());
             }
         }
         catch (e) {

package/package.json

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

package/src/user.ts

@@ -109,7 +109,7 @@ export class User {
 			);
 		} else if (config.accountSubscription?.type === 'custom') {
 			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
-		} else if (config.accountSubscription?.type === 'websocket') {
+		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
 				config.userAccountPublicKey,

package/src/userMap/userMap.ts

@@ -79,6 +79,14 @@ export class UserMap implements UserMapInterface {
 		this.syncCallbackCriteria = syncCallbackCriteria;
 	}
 
+	public addSyncCallback(
+		syncCallback?: (authorities: PublicKey[]) => Promise<void>,
+		syncCallbackCriteria: SyncCallbackCriteria = { hasOpenOrders: false }
+	) {
+		this.syncCallback = syncCallback;
+		this.syncCallbackCriteria = syncCallbackCriteria;
+	}
+
 	public async subscribe() {
 		if (this.size() > 0) {
 			return;
@@ -208,6 +216,30 @@ export class UserMap implements UserMapInterface {
 		return this.userMap.size;
 	}
 
+	public getUniqueAuthorities(useSyncCallbackCriteria = true): PublicKey[] {
+		const usersMeetingCriteria = Array.from(this.userMap.values()).filter(
+			(user) => {
+				let pass = true;
+				if (
+					useSyncCallbackCriteria &&
+					this.syncCallbackCriteria.hasOpenOrders
+				) {
+					pass = pass && user.getUserAccount().hasOpenOrder;
+				}
+				return pass;
+			}
+		);
+		const userAuths = new Set(
+			usersMeetingCriteria.map((user) =>
+				user.getUserAccount().authority.toBase58()
+			)
+		);
+		const userAuthKeys = Array.from(userAuths).map(
+			(userAuth) => new PublicKey(userAuth)
+		);
+		return userAuthKeys;
+	}
+
 	public async sync() {
 		if (this.syncPromise) {
 			return this.syncPromise;
@@ -288,24 +320,7 @@ export class UserMap implements UserMapInterface {
 			}
 
 			if (this.syncCallback) {
-				const usersMeetingCriteria = Array.from(this.userMap.values()).filter(
-					(user) => {
-						let pass = true;
-						if (this.syncCallbackCriteria.hasOpenOrders) {
-							pass = pass && user.getUserAccount().hasOpenOrder;
-						}
-						return pass;
-					}
-				);
-				const userAuths = new Set(
-					usersMeetingCriteria.map((user) =>
-						user.getUserAccount().authority.toBase58()
-					)
-				);
-				const userAuthKeys = Array.from(userAuths).map(
-					(userAuth) => new PublicKey(userAuth)
-				);
-				await this.syncCallback(userAuthKeys);
+				await this.syncCallback(this.getUniqueAuthorities());
 			}
 		} catch (e) {
 			console.error(`Error in UserMap.sync()`);