@drift-labs/sdk 0.1.34-master.0 → 0.1.34-master.1

package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts

@@ -35,6 +35,7 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     getClearingHouseAccounts(): Promise<ClearingHouseAccounts>;
     addToAccountLoader(): Promise<void>;
     fetch(): Promise<void>;
+    didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     assertOptionalIsSubscribed(optionalSubscription: ClearingHouseAccountTypes): void;

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -42,11 +42,14 @@ class PollingClearingHouseAccountSubscriber {
             yield this.updateAccountsToPoll();
             yield this.addToAccountLoader();
             yield this.fetch();
-            this.eventEmitter.emit('update');
+            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
             this.isSubscribing = false;
-            this.isSubscribed = true;
-            this.subscriptionPromiseResolver(true);
-            return true;
+            this.isSubscribed = subscriptionSucceeded;
+            this.subscriptionPromiseResolver(subscriptionSucceeded);
+            return subscriptionSucceeded;
         });
     }
     updateAccountsToPoll() {
@@ -177,6 +180,16 @@ class PollingClearingHouseAccountSubscriber {
             }
         });
     }
+    didSubscriptionSucceed() {
+        let success = true;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            if (!this[accountToPoll.key]) {
+                success = false;
+                break;
+            }
+        }
+        return success;
+    }
     unsubscribe() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isSubscribed) {

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -24,6 +24,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
+    didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -31,9 +31,12 @@ class PollingUserAccountSubscriber {
             }
             yield this.addToAccountLoader();
             yield this.fetchIfUnloaded();
-            this.eventEmitter.emit('update');
-            this.isSubscribed = true;
-            return true;
+            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
+            this.isSubscribed = subscriptionSucceeded;
+            return subscriptionSucceeded;
         });
     }
     addToAccountLoader(userPublicKeys) {
@@ -122,6 +125,17 @@ class PollingUserAccountSubscriber {
             }
         });
     }
+    didSubscriptionSucceed() {
+        let success = true;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            // userOrders may not exist
+            if (accountToPoll.key !== 'userOrders' && !this[accountToPoll.key]) {
+                success = false;
+                break;
+            }
+        }
+        return success;
+    }
     unsubscribe() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isSubscribed) {

package/package.json

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

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -86,13 +86,17 @@ export class PollingClearingHouseAccountSubscriber
 		await this.updateAccountsToPoll();
 		await this.addToAccountLoader();
 		await this.fetch();
-		this.eventEmitter.emit('update');
+		const subscriptionSucceeded = this.didSubscriptionSucceed();
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
 
 		this.isSubscribing = false;
-		this.isSubscribed = true;
-		this.subscriptionPromiseResolver(true);
+		this.isSubscribed = subscriptionSucceeded;
+		this.subscriptionPromiseResolver(subscriptionSucceeded);
 
-		return true;
+		return subscriptionSucceeded;
 	}
 
 	async updateAccountsToPoll(): Promise<void> {
@@ -254,6 +258,17 @@ export class PollingClearingHouseAccountSubscriber
 		}
 	}
 
+	didSubscriptionSucceed(): boolean {
+		let success = true;
+		for (const [_, accountToPoll] of this.accountsToPoll) {
+			if (!this[accountToPoll.key]) {
+				success = false;
+				break;
+			}
+		}
+		return success;
+	}
+
 	public async unsubscribe(): Promise<void> {
 		if (!this.isSubscribed) {
 			return;

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -53,10 +53,15 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 		await this.addToAccountLoader();
 		await this.fetchIfUnloaded();
-		this.eventEmitter.emit('update');
 
-		this.isSubscribed = true;
-		return true;
+		const subscriptionSucceeded = this.didSubscriptionSucceed();
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
+
+		this.isSubscribed = subscriptionSucceeded;
+		return subscriptionSucceeded;
 	}
 
 	async addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void> {
@@ -168,6 +173,18 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 	}
 
+	didSubscriptionSucceed(): boolean {
+		let success = true;
+		for (const [_, accountToPoll] of this.accountsToPoll) {
+			// userOrders may not exist
+			if (accountToPoll.key !== 'userOrders' && !this[accountToPoll.key]) {
+				success = false;
+				break;
+			}
+		}
+		return success;
+	}
+
 	async unsubscribe(): Promise<void> {
 		if (!this.isSubscribed) {
 			return;