-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #602 from drift-labs/ws-resub
resub after timeout
- Loading branch information
Showing
13 changed files
with
311 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types'; | ||
| import { AnchorProvider, Program } from '@coral-xyz/anchor'; | ||
| import { | ||
| Commitment, | ||
| Context, | ||
| KeyedAccountInfo, | ||
| MemcmpFilter, | ||
| PublicKey, | ||
| } from '@solana/web3.js'; | ||
| import * as Buffer from 'buffer'; | ||
|
|
||
| export class WebSocketProgramAccountSubscriber<T> | ||
| implements ProgramAccountSubscriber<T> | ||
| { | ||
| subscriptionName: string; | ||
| accountDiscriminator: string; | ||
| dataAndSlot?: DataAndSlot<T> & { accountId: PublicKey }; | ||
| bufferAndSlot?: BufferAndSlot; | ||
| program: Program; | ||
| decodeBuffer: (accountName: string, ix: Buffer) => T; | ||
| onChange: (accountId: PublicKey, data: T, context: Context) => void; | ||
| listenerId?: number; | ||
| resubTimeoutMs?: number; | ||
| timeoutId?: NodeJS.Timeout; | ||
| options: { filters: MemcmpFilter[]; commitment?: Commitment }; | ||
|
|
||
| receivingData = false; | ||
|
|
||
| public constructor( | ||
| subscriptionName: string, | ||
| accountDiscriminator: string, | ||
| program: Program, | ||
| decodeBufferFn: (accountName: string, ix: Buffer) => T, | ||
| options: { filters: MemcmpFilter[]; commitment?: Commitment } = { | ||
| filters: [], | ||
| }, | ||
| resubTimeoutMs?: number | ||
| ) { | ||
| this.subscriptionName = subscriptionName; | ||
| this.accountDiscriminator = accountDiscriminator; | ||
| this.program = program; | ||
| this.decodeBuffer = decodeBufferFn; | ||
| this.resubTimeoutMs = resubTimeoutMs; | ||
| this.options = options; | ||
| this.receivingData = false; | ||
| } | ||
|
|
||
| async subscribe( | ||
| onChange: (accountId: PublicKey, data: T, context: Context) => void | ||
| ): Promise<void> { | ||
| if (this.listenerId) { | ||
| return; | ||
| } | ||
|
|
||
| this.onChange = onChange; | ||
|
|
||
| this.listenerId = this.program.provider.connection.onProgramAccountChange( | ||
| this.program.programId, | ||
| (keyedAccountInfo, context) => { | ||
| if (this.resubTimeoutMs) { | ||
| this.receivingData = true; | ||
| clearTimeout(this.timeoutId); | ||
| this.handleRpcResponse(context, keyedAccountInfo); | ||
| this.setTimeout(); | ||
| } else { | ||
| this.handleRpcResponse(context, keyedAccountInfo); | ||
| } | ||
| }, | ||
| this.options.commitment ?? | ||
| (this.program.provider as AnchorProvider).opts.commitment, | ||
| this.options.filters | ||
| ); | ||
|
|
||
| if (this.resubTimeoutMs) { | ||
| this.setTimeout(); | ||
| } | ||
| } | ||
|
|
||
| private setTimeout(): void { | ||
| if (!this.onChange) { | ||
| throw new Error('onChange callback function must be set'); | ||
| } | ||
| this.timeoutId = setTimeout(async () => { | ||
| if (this.receivingData) { | ||
| console.log( | ||
| `No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing` | ||
| ); | ||
| await this.unsubscribe(); | ||
| this.receivingData = false; | ||
| await this.subscribe(this.onChange); | ||
| } | ||
| }, this.resubTimeoutMs); | ||
| } | ||
|
|
||
| handleRpcResponse( | ||
| context: Context, | ||
| keyedAccountInfo: KeyedAccountInfo | ||
| ): void { | ||
| const newSlot = context.slot; | ||
| let newBuffer: Buffer | undefined = undefined; | ||
| if (keyedAccountInfo) { | ||
| newBuffer = keyedAccountInfo.accountInfo.data; | ||
| } | ||
|
|
||
| if (!this.bufferAndSlot) { | ||
| this.bufferAndSlot = { | ||
| buffer: newBuffer, | ||
| slot: newSlot, | ||
| }; | ||
| if (newBuffer) { | ||
| const account = this.decodeBuffer(this.accountDiscriminator, newBuffer); | ||
| this.dataAndSlot = { | ||
| data: account, | ||
| slot: newSlot, | ||
| accountId: keyedAccountInfo.accountId, | ||
| }; | ||
| this.onChange(keyedAccountInfo.accountId, account, context); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| if (newSlot <= this.bufferAndSlot.slot) { | ||
| return; | ||
| } | ||
|
|
||
| const oldBuffer = this.bufferAndSlot.buffer; | ||
| if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) { | ||
| this.bufferAndSlot = { | ||
| buffer: newBuffer, | ||
| slot: newSlot, | ||
| }; | ||
| const account = this.decodeBuffer(this.accountDiscriminator, newBuffer); | ||
| this.dataAndSlot = { | ||
| data: account, | ||
| slot: newSlot, | ||
| accountId: keyedAccountInfo.accountId, | ||
| }; | ||
| this.onChange(keyedAccountInfo.accountId, account, context); | ||
| } | ||
| } | ||
|
|
||
| unsubscribe(): Promise<void> { | ||
| if (this.listenerId) { | ||
| const promise = | ||
| this.program.provider.connection.removeAccountChangeListener( | ||
| this.listenerId | ||
| ); | ||
| this.listenerId = undefined; | ||
| return promise; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.