@velocity-exchange/sdk 0.1.0 → 0.2.0

package/lib/browser/accounts/pollingVelocityClientAccountSubscriber.js

@@ -25,6 +25,10 @@ class PollingVelocityClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = new Promise((res) => {
+            this.subscriptionPromiseResolver = res;
+        });
         this.isSubscribed = false;
         this.program = program;
         this.eventEmitter = new events_1.EventEmitter();
@@ -148,21 +152,39 @@ class PollingVelocityClientAccountSubscriber {
             this.eventEmitter.emit('error', error);
         });
     }
+    /**
+     * Routes a freshly-decoded account into the correct container based on
+     * its poll key. Replaces dynamic `this[key]` indexing with explicit,
+     * type-checked dispatch.
+     */
+    storeDecodedAccount(accountToPoll, account, slot) {
+        const dataAndSlot = { data: account, slot };
+        switch (accountToPoll.key) {
+            case 'perpMarket':
+                if (accountToPoll.mapKey !== undefined) {
+                    this.perpMarket.set(accountToPoll.mapKey, dataAndSlot);
+                }
+                break;
+            case 'spotMarket':
+                if (accountToPoll.mapKey !== undefined) {
+                    this.spotMarket.set(accountToPoll.mapKey, dataAndSlot);
+                }
+                break;
+            case 'state':
+                this.state = dataAndSlot;
+                break;
+            default: {
+                const _exhaustive = accountToPoll.key;
+                throw new Error(`Unhandled account poll key: ${String(_exhaustive)}`);
+            }
+        }
+    }
     async addAccountToAccountLoader(accountToPoll) {
         accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
             const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
-            const dataAndSlot = {
-                data: account,
-                slot,
-            };
-            if (accountToPoll.mapKey != undefined) {
-                this[accountToPoll.key].set(accountToPoll.mapKey, dataAndSlot);
-            }
-            else {
-                this[accountToPoll.key] = dataAndSlot;
-            }
+            this.storeDecodedAccount(accountToPoll, account, slot);
             // @ts-ignore
             this.eventEmitter.emit(accountToPoll.eventType, account);
             this.eventEmitter.emit('update');
@@ -177,6 +199,8 @@ class PollingVelocityClientAccountSubscriber {
         oracleToPoll.callbackId = await this.accountLoader.addAccount(oracleToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
+            if (!oracleClient)
+                return;
             const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
             const dataAndSlot = {
                 data: oraclePriceData,
@@ -197,18 +221,7 @@ class PollingVelocityClientAccountSubscriber {
             const { buffer, slot } = bufferAndSlot;
             if (buffer) {
                 const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
-                if (accountToPoll.mapKey != undefined) {
-                    this[accountToPoll.key].set(accountToPoll.mapKey, {
-                        data: account,
-                        slot,
-                    });
-                }
-                else {
-                    this[accountToPoll.key] = {
-                        data: account,
-                        slot,
-                    };
-                }
+                this.storeDecodedAccount(accountToPoll, account, slot);
             }
         }
         for (const [_, oracleToPoll] of this.oraclesToPoll) {
@@ -219,6 +232,9 @@ class PollingVelocityClientAccountSubscriber {
             const { buffer, slot } = bufferAndSlot;
             if (buffer) {
                 const oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection, this.program);
+                if (!oracleClient) {
+                    continue;
+                }
                 const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
                 this.oracles.set((0, oracleId_1.getOracleId)(oracleToPoll.publicKey, oracleToPoll.source), {
                     data: oraclePriceData,
@@ -252,6 +268,9 @@ class PollingVelocityClientAccountSubscriber {
         }
         await this.addSpotMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+        if (!accountToPoll) {
+            return false;
+        }
         await this.addAccountToAccountLoader(accountToPoll);
         this.setSpotOracleMap();
         return true;
@@ -263,6 +282,9 @@ class PollingVelocityClientAccountSubscriber {
         }
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+        if (!accountToPoll) {
+            return false;
+        }
         await this.addAccountToAccountLoader(accountToPoll);
         await this.setPerpOracleMap();
         return true;
@@ -278,7 +300,9 @@ class PollingVelocityClientAccountSubscriber {
         if (!this.oraclesToPoll.has(oracleId)) {
             this.addOracleToPoll(oracleInfo);
             const oracleToPoll = this.oraclesToPoll.get(oracleId);
-            await this.addOracleToAccountLoader(oracleToPoll);
+            if (oracleToPoll) {
+                await this.addOracleToAccountLoader(oracleToPoll);
+            }
         }
         await this.pauseForOracleToBeAdded(3, oracleInfo.publicKey.toBase58());
         return true;
@@ -338,8 +362,16 @@ class PollingVelocityClientAccountSubscriber {
         }
         const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
         for (const perpMarketIndex of perpMarketIndexes) {
-            const perpMarketPubkey = this.perpMarket.get(perpMarketIndex).data.pubkey;
-            const callbackId = this.accountsToPoll.get(perpMarketPubkey.toBase58()).callbackId;
+            const perpMarketData = this.perpMarket.get(perpMarketIndex);
+            if (!perpMarketData) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in perpMarket map`);
+            }
+            const perpMarketPubkey = perpMarketData.data.pubkey;
+            const accountToPoll = this.accountsToPoll.get(perpMarketPubkey.toBase58());
+            if (!accountToPoll) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in accountsToPoll map`);
+            }
+            const callbackId = accountToPoll.callbackId;
             this.accountLoader.removeAccount(perpMarketPubkey, callbackId);
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.perpMarket.delete(perpMarketIndex);
@@ -347,7 +379,11 @@ class PollingVelocityClientAccountSubscriber {
         }
         for (const oracle of oracles) {
             const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
-            const callbackId = this.oraclesToPoll.get(oracleId).callbackId;
+            const oracleToPoll = this.oraclesToPoll.get(oracleId);
+            if (!oracleToPoll) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted oracle ${oracleId} not found in oraclesToPoll map`);
+            }
+            const callbackId = oracleToPoll.callbackId;
             this.accountLoader.removeAccount(oracle.publicKey, callbackId);
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.oracles.delete(oracleId);
@@ -389,7 +425,7 @@ class PollingVelocityClientAccountSubscriber {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
         const oracleId = this.perpOracleStringMap.get(marketIndex);
-        if (!perpMarketAccount || !oracle) {
+        if (!perpMarketAccount || !oracle || !oracleId) {
             return undefined;
         }
         if (!perpMarketAccount.data.oracle.equals(oracle)) {
@@ -402,7 +438,7 @@ class PollingVelocityClientAccountSubscriber {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
         const oracleId = this.spotOracleStringMap.get(marketIndex);
-        if (!spotMarketAccount || !oracle) {
+        if (!spotMarketAccount || !oracle || !oracleId) {
             return undefined;
         }
         if (!spotMarketAccount.data.oracle.equals(oracle)) {

package/lib/browser/accounts/types.d.ts

@@ -85,7 +85,7 @@ export interface UserAccountSubscriber {
     fetch(): Promise<void>;
     updateData(userAccount: UserAccount, slot: number): void;
     unsubscribe(): Promise<void>;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
 }
 export interface TokenAccountEvents {
     tokenAccountUpdate: (payload: Account) => void;
@@ -106,7 +106,7 @@ export interface InsuranceFundStakeAccountSubscriber {
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> | undefined;
 }
 export interface InsuranceFundStakeAccountEvents {
     insuranceFundStakeAccountUpdate: (payload: InsuranceFundStake) => void;
@@ -127,7 +127,7 @@ export interface OracleAccountSubscriber {
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
 export type AccountToPoll = {
-    key: string;
+    key: 'state' | 'perpMarket' | 'spotMarket';
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
@@ -163,7 +163,7 @@ export interface UserStatsAccountSubscriber {
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }
 type BaseGrpcConfigs = {
     endpoint: string;

package/lib/browser/accounts/utils.d.ts

@@ -2,6 +2,7 @@ import { DataAndSlot } from './types';
 import { PerpMarketAccount, SpotMarketAccount } from '../types';
 import { OracleInfo } from '../oracles/types';
 export declare function capitalize(value: string): string;
+export declare function assertDataAndSlot<T>(dataAndSlot: DataAndSlot<T> | undefined, message: string): DataAndSlot<T>;
 export declare function findDelistedPerpMarketsAndOracles(perpMarkets: DataAndSlot<PerpMarketAccount>[], spotMarkets: DataAndSlot<SpotMarketAccount>[]): {
     perpMarketIndexes: number[];
     oracles: OracleInfo[];

package/lib/browser/accounts/utils.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDelistedPerpMarketsAndOracles = exports.capitalize = void 0;
+exports.findDelistedPerpMarketsAndOracles = exports.assertDataAndSlot = exports.capitalize = void 0;
 const types_1 = require("../types");
 const oracleId_1 = require("../oracles/oracleId");
 function capitalize(value) {
     return value[0].toUpperCase() + value.slice(1);
 }
 exports.capitalize = capitalize;
+function assertDataAndSlot(dataAndSlot, message) {
+    if (!dataAndSlot) {
+        throw new Error(message);
+    }
+    return dataAndSlot;
+}
+exports.assertDataAndSlot = assertDataAndSlot;
 function findDelistedPerpMarketsAndOracles(perpMarkets, spotMarkets) {
     const delistedPerpMarketIndexes = [];
     const delistedOracles = [];

package/lib/browser/accounts/webSocketAccountSubscriber.d.ts

@@ -10,8 +10,10 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     logAccountName: string;
     program: VelocityProgram;
     accountPublicKey: PublicKey;
-    decodeBufferFn: (buffer: Buffer) => T;
-    onChange: (data: T) => void;
+    decodeBufferFn?: (buffer: Buffer) => T;
+    private _onChange?;
+    get onChange(): (data: T) => void;
+    set onChange(onChange: (data: T) => void);
     listenerId?: number;
     resubOpts?: ResubOpts;
     commitment?: Commitment;

package/lib/browser/accounts/webSocketAccountSubscriber.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 class WebSocketAccountSubscriber {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment) {
         var _a;
         this.isUnsubscribing = false;
@@ -11,7 +20,8 @@ class WebSocketAccountSubscriber {
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
         this.resubOpts = resubOpts;
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log(`resubTimeoutMs should be at least 1000ms to avoid spamming resub ${this.logAccountName}`);
         }
         this.receivingData = false;
@@ -54,12 +64,12 @@ class WebSocketAccountSubscriber {
         }
         this.dataAndSlot = {
             data,
-            slot,
+            slot: newSlot,
         };
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -90,8 +100,9 @@ class WebSocketAccountSubscriber {
         }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     async fetch() {
+        var _a;
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
-        this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);
+        this.handleRpcResponse(rpcResponse.context, (_a = rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value) !== null && _a !== void 0 ? _a : undefined);
     }
     handleRpcResponse(context, accountInfo) {
         const newSlot = context.slot;
@@ -136,7 +147,7 @@ class WebSocketAccountSubscriber {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode(this.accountName, buffer);
+            return this.program.coder.accounts.decode(this.accountName, buffer);
         }
     }
     unsubscribe(onResub = false) {
@@ -164,6 +175,7 @@ class WebSocketAccountSubscriber {
         }
         else {
             this.isUnsubscribing = false;
+            return Promise.resolve();
         }
     }
 }

package/lib/browser/accounts/webSocketAccountSubscriberV2.d.ts

@@ -59,8 +59,10 @@ export declare class WebSocketAccountSubscriberV2<T> implements AccountSubscribe
     logAccountName: string;
     program: VelocityProgram;
     accountPublicKey: PublicKey;
-    decodeBufferFn: (buffer: Buffer) => T;
-    onChange: (data: T) => void;
+    decodeBufferFn?: (buffer: Buffer) => T;
+    private _onChange?;
+    get onChange(): (data: T) => void;
+    set onChange(onChange: (data: T) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     commitment?: Commitment;

package/lib/browser/accounts/webSocketAccountSubscriberV2.js

@@ -56,6 +56,15 @@ const bs58_1 = __importDefault(require("bs58"));
  *   program provider’s RPC endpoint. Handles base58/base64 encoded data.
  */
 class WebSocketAccountSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     /**
      * Create a single-account WebSocket subscriber with optional polling fallback.
      *
@@ -70,6 +79,7 @@ class WebSocketAccountSubscriberV2 {
      * @param rpc Optional override/injection for testing.
      */
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment, rpcSubscriptions, rpc) {
+        var _a;
         this.isUnsubscribing = false;
         this.accountName = accountName;
         this.logAccountName = `${accountName}-${accountPublicKey.toBase58()}-ws-acct-subscriber-v2`;
@@ -81,11 +91,12 @@ class WebSocketAccountSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (this.resubOpts.resubTimeoutMs < 1000) {
+        if (this.resubOpts.resubTimeoutMs != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log(`resubTimeoutMs should be at least 1000ms to avoid spamming resub ${this.logAccountName}`);
         }
         this.receivingData = false;
-        if (['recent', 'single', 'singleGossip', 'root', 'max'].includes(this.program.provider.opts.commitment)) {
+        if (['recent', 'single', 'singleGossip', 'root', 'max'].includes((_a = this.program.provider.opts.commitment) !== null && _a !== void 0 ? _a : '')) {
             console.warn(`using commitment ${this.program.provider.opts.commitment} that is not supported by gill, this may cause issues`);
         }
         this.commitment =
@@ -185,7 +196,7 @@ class WebSocketAccountSubscriberV2 {
         }
         this.dataAndSlot = {
             data,
-            slot,
+            slot: newSlot,
         };
     }
     setTimeout() {
@@ -194,7 +205,7 @@ class WebSocketAccountSubscriberV2 {
          * `resubOpts.resubTimeoutMs` and `receivingData` is true, trigger either
          * a polling loop or a resubscribe depending on options.
          */
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -305,7 +316,7 @@ class WebSocketAccountSubscriberV2 {
             slot: Number(rpcResponse.context.slot),
         };
         const accountInfo = rpcResponse.value;
-        this.handleRpcResponse({ slot: BigInt(context.slot) }, accountInfo);
+        this.handleRpcResponse({ slot: BigInt(context.slot) }, accountInfo !== null && accountInfo !== void 0 ? accountInfo : undefined);
     }
     handleRpcResponse(context, accountInfo) {
         const newSlot = context.slot;
@@ -365,7 +376,7 @@ class WebSocketAccountSubscriberV2 {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
+            return this.program.coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
         }
     }
     unsubscribe(onResub = false) {

package/lib/browser/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts

@@ -12,12 +12,14 @@ export declare class WebSocketInsuranceFundStakeAccountSubscriber implements Ins
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
-    insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
+    private _insuranceFundStakeDataAccountSubscriber?;
+    get insuranceFundStakeDataAccountSubscriber(): AccountSubscriber<InsuranceFundStake>;
+    set insuranceFundStakeDataAccountSubscriber(subscriber: AccountSubscriber<InsuranceFundStake>);
     constructor(program: VelocityProgram, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(insuranceFundStakeAccount?: InsuranceFundStake): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> | undefined;
     updateData(insuranceFundStake: InsuranceFundStake, slot: number): void;
 }

package/lib/browser/accounts/webSocketInsuranceFundStakeAccountSubscriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
+    get insuranceFundStakeDataAccountSubscriber() {
+        if (!this._insuranceFundStakeDataAccountSubscriber) {
+            throw new Error('insuranceFundStakeDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._insuranceFundStakeDataAccountSubscriber;
+    }
+    set insuranceFundStakeDataAccountSubscriber(subscriber) {
+        this._insuranceFundStakeDataAccountSubscriber = subscriber;
+    }
     constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;

package/lib/browser/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -10,7 +10,9 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts?: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountSubscriber.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketProgramAccountSubscriber = void 0;
 class WebSocketProgramAccountSubscriber {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts) {
@@ -14,7 +23,8 @@ class WebSocketProgramAccountSubscriber {
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
         this.resubOpts = resubOpts;
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -45,7 +55,7 @@ class WebSocketProgramAccountSubscriber {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -97,7 +107,7 @@ class WebSocketProgramAccountSubscriber {
         }
     }
     unsubscribe(onResub = false) {
-        if (!onResub) {
+        if (!onResub && this.resubOpts) {
             this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
@@ -114,6 +124,7 @@ class WebSocketProgramAccountSubscriber {
         }
         else {
             this.isUnsubscribing = false;
+            return Promise.resolve();
         }
     }
 }

package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.d.ts

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.js

@@ -67,6 +67,15 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
@@ -94,7 +103,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) !== undefined &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +222,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +272,9 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            newBuffer &&
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                !newBuffer.equals(existingBufferAndSlot.buffer))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.d.ts

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.js

@@ -67,11 +67,19 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
     ) {
-        var _a;
         this.bufferAndSlotMap = new Map();
         this.isUnsubscribing = false;
         this.receivingData = false;
@@ -94,7 +102,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (this.resubOpts.resubTimeoutMs != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +221,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +271,8 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                (newBuffer != null && !existingBufferAndSlot.buffer.equals(newBuffer)))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

package/lib/browser/accounts/webSocketUserAccountSubscriber.d.ts

@@ -12,12 +12,14 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
-    userDataAccountSubscriber: AccountSubscriber<UserAccount>;
+    private _userDataAccountSubscriber?;
+    get userDataAccountSubscriber(): AccountSubscriber<UserAccount>;
+    set userDataAccountSubscriber(subscriber: AccountSubscriber<UserAccount>);
     constructor(program: VelocityProgram, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     updateData(userAccount: UserAccount, slot: number): void;
 }