fix: unhandled resub logic

Author: LukasDeco

sdk/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -136,7 +136,19 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 				'perpMarket',
 				this.program,
 				undefined,
-				this.resubOpts
+				this.resubOpts,
+				undefined,
+				async () => {
+					try {
+						if (this.resubOpts?.logResubMessages) {
+							console.log('[grpcDriftClientAccountSubscriberV2] perp markets subscriber unsubscribed; resubscribing');
+						}
+						await this.subscribeToPerpMarketAccounts();
+					} catch (e) {
+						console.error('Perp markets resubscribe failed:', e);
+					}
+				}
+				
 			);
 		await this.perpMarketsSubscriber.subscribe(
 			perpMarketPubkeys,
@@ -165,7 +177,18 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 				'spotMarket',
 				this.program,
 				undefined,
-				this.resubOpts
+				this.resubOpts,
+				undefined,
+				async () => {
+					try {
+						if (this.resubOpts?.logResubMessages) {
+							console.log('[grpcDriftClientAccountSubscriberV2] spot markets subscriber unsubscribed; resubscribing');
+						}
+						await this.subscribeToSpotMarketAccounts();
+					} catch (e) {
+						console.error('Spot markets resubscribe failed:', e);
+					}
+				}
 			);
 		await this.spotMarketsSubscriber.subscribe(
 			spotMarketPubkeys,
@@ -221,7 +244,18 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 					);
 					return client.getOraclePriceDataFromBuffer(buffer);
 				},
-				this.resubOpts
+				this.resubOpts,
+				undefined,
+				async () => {
+					try {
+						if (this.resubOpts?.logResubMessages) {
+							console.log('[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing');
+						}
+						await this.subscribeToOracles();
+					} catch (e) {
+						console.error('Oracle resubscribe failed:', e);
+					}
+				}
 			);
 
 		await this.oracleMultiSubscriber.subscribe(
@@ -233,6 +267,7 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 			}
 		);
 
+
 		return true;
 	}
 

sdk/src/accounts/grpcMultiAccountSubscriber.ts

@@ -29,6 +29,7 @@ export class grpcMultiAccountSubscriber<T> {
 	private accountName: string;
 	private decodeBufferFn?: (buffer: Buffer, pubkey?: string) => T;
 	private resubOpts?: ResubOpts;
+	private onUnsubscribe?: () => Promise<void>;
 
 	public listenerId?: number;
 	public isUnsubscribing = false;
@@ -47,14 +48,16 @@ export class grpcMultiAccountSubscriber<T> {
 		accountName: string,
 		program: Program,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string) => T,
-		resubOpts?: ResubOpts
+		resubOpts?: ResubOpts,
+		onUnsubscribe?: () => Promise<void>
 	) {
 		this.client = client;
 		this.commitmentLevel = commitmentLevel;
 		this.accountName = accountName;
 		this.program = program;
 		this.decodeBufferFn = decodeBuffer;
 		this.resubOpts = resubOpts;
+		this.onUnsubscribe = onUnsubscribe;
 	}
 
 	public static async create<U>(
@@ -63,7 +66,8 @@ export class grpcMultiAccountSubscriber<T> {
 		program: Program,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string) => U,
 		resubOpts?: ResubOpts,
-		clientProp?: Client
+		clientProp?: Client,
+		onUnsubscribe?: () => Promise<void>
 	): Promise<grpcMultiAccountSubscriber<U>> {
 		const client = clientProp
 			? clientProp
@@ -82,7 +86,8 @@ export class grpcMultiAccountSubscriber<T> {
 			accountName,
 			program,
 			decodeBuffer,
-			resubOpts
+			resubOpts,
+			onUnsubscribe
 		);
 	}
 
@@ -291,6 +296,14 @@ export class grpcMultiAccountSubscriber<T> {
 		} else {
 			this.isUnsubscribing = false;
 		}
+
+		if(this.onUnsubscribe) {
+			try {
+				await this.onUnsubscribe();
+			} catch (e) {
+				console.error(e);
+			}
+		}
 	}
 
 	private setTimeout(): void {
@@ -302,7 +315,6 @@ export class grpcMultiAccountSubscriber<T> {
 				if (this.receivingData) {
 					await this.unsubscribe();
 					this.receivingData = false;
-					// Caller should handle resubscribe; keep minimal to avoid duplication
 				}
 			},
 			this.resubOpts?.resubTimeoutMs