refactor(sdk): use ReturnType for Timeout types (#1637)

ChesterSim · web-flow · commit 1ce4d3de7b25 · 2025-05-27T17:08:26.000+08:00
diff --git a/sdk/bun.lock b/sdk/bun.lock
diff --git a/sdk/src/accounts/webSocketAccountSubscriber.ts b/sdk/src/accounts/webSocketAccountSubscriber.ts
@@ -24,7 +24,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	commitment?: Commitment;
 	isUnsubscribing = false;
 
-	timeoutId?: NodeJS.Timeout;
+	timeoutId?: ReturnType<typeof setTimeout>;
 
 	receivingData: boolean;
 
diff --git a/sdk/src/accounts/webSocketProgramAccountSubscriber.ts b/sdk/src/accounts/webSocketProgramAccountSubscriber.ts
@@ -27,7 +27,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	listenerId?: number;
 	resubOpts?: ResubOpts;
 	isUnsubscribing = false;
-	timeoutId?: NodeJS.Timeout;
+	timeoutId?: ReturnType<typeof setTimeout>;
 	options: { filters: MemcmpFilter[]; commitment?: Commitment };
 
 	receivingData = false;
diff --git a/sdk/src/blockhashSubscriber/BlockhashSubscriber.ts b/sdk/src/blockhashSubscriber/BlockhashSubscriber.ts
@@ -12,7 +12,7 @@ export class BlockhashSubscriber {
 	private latestBlockHeight: number;
 	private latestBlockHeightContext: Context | undefined;
 	private blockhashes: Array<BlockhashWithExpiryBlockHeight> = [];
-	private updateBlockhashIntervalId: NodeJS.Timeout | undefined;
+	private updateBlockhashIntervalId: ReturnType<typeof setTimeout> | undefined;
 	private commitment: Commitment;
 	private updateIntervalMs: number;
 
diff --git a/sdk/src/clock/clockSubscriber.ts b/sdk/src/clock/clockSubscriber.ts
@@ -29,7 +29,7 @@ export class ClockSubscriber {
 	}
 
 	// Reconnection
-	private timeoutId?: NodeJS.Timeout;
+	private timeoutId?: ReturnType<typeof setTimeout>;
 	private resubTimeoutMs?: number;
 	private isUnsubscribing = false;
 	private receivingData = false;
diff --git a/sdk/src/dlob/DLOBSubscriber.ts b/sdk/src/dlob/DLOBSubscriber.ts
@@ -24,7 +24,7 @@ export class DLOBSubscriber {
 	dlobSource: DLOBSource;
 	slotSource: SlotSource;
 	updateFrequency: number;
-	intervalId?: NodeJS.Timeout;
+	intervalId?: ReturnType<typeof setTimeout>;
 	dlob: DLOB;
 	public eventEmitter: StrictEventEmitter<EventEmitter, DLOBSubscriberEvents>;
 	protectedMakerView: boolean;
diff --git a/sdk/src/events/eventsServerLogProvider.ts b/sdk/src/events/eventsServerLogProvider.ts
@@ -19,7 +19,7 @@ export class EventsServerLogProvider implements LogProvider {
 	private isUnsubscribing = false;
 	private externalUnsubscribe = false;
 	private lastHeartbeat = 0;
-	private timeoutId?: NodeJS.Timeout;
+	private timeoutId?: ReturnType<typeof setTimeout>;
 	private reconnectAttempts = 0;
 	eventEmitter?: EventEmitter;
 
diff --git a/sdk/src/events/webSocketLogProvider.ts b/sdk/src/events/webSocketLogProvider.ts
@@ -13,7 +13,7 @@ export class WebSocketLogProvider implements LogProvider {
 	private isUnsubscribing = false;
 	private externalUnsubscribe = false;
 	private receivingData = false;
-	private timeoutId?: NodeJS.Timeout;
+	private timeoutId?: ReturnType<typeof setTimeout>;
 	private reconnectAttempts = 0;
 	eventEmitter?: EventEmitter;
 	private callback?: logProviderCallback;
diff --git a/sdk/src/indicative-quotes/indicativeQuotesSender.ts b/sdk/src/indicative-quotes/indicativeQuotesSender.ts
@@ -17,8 +17,8 @@ type Quote = {
 };
 
 export class IndicativeQuotesSender {
-	private heartbeatTimeout: NodeJS.Timeout | null = null;
-	private sendQuotesInterval: NodeJS.Timeout | null = null;
+	private heartbeatTimeout: ReturnType<typeof setTimeout> | null = null;
+	private sendQuotesInterval: ReturnType<typeof setTimeout> | null = null;
 
 	private readonly heartbeatIntervalMs = 60000;
 	private reconnectDelay = 1000;
diff --git a/sdk/src/orderSubscriber/WebsocketSubscription.ts b/sdk/src/orderSubscriber/WebsocketSubscription.ts
@@ -13,7 +13,7 @@ export class WebsocketSubscription {
 	private resyncIntervalMs?: number;
 
 	private subscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
-	private resyncTimeoutId?: NodeJS.Timeout;
+	private resyncTimeoutId?: ReturnType<typeof setTimeout>;
 
 	private decoded?: boolean;
 
diff --git a/sdk/src/orderSubscriber/grpcSubscription.ts b/sdk/src/orderSubscriber/grpcSubscription.ts
@@ -13,7 +13,7 @@ export class grpcSubscription {
 	private resyncIntervalMs?: number;
 
 	private subscriber?: grpcProgramAccountSubscriber<UserAccount>;
-	private resyncTimeoutId?: NodeJS.Timeout;
+	private resyncTimeoutId?: ReturnType<typeof setTimeout>;
 
 	private decoded?: boolean;
 
diff --git a/sdk/src/slot/SlotSubscriber.ts b/sdk/src/slot/SlotSubscriber.ts
@@ -17,7 +17,7 @@ export class SlotSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
 
 	// Reconnection
-	timeoutId?: NodeJS.Timeout;
+	timeoutId?: ReturnType<typeof setTimeout>;
 	resubTimeoutMs?: number;
 	isUnsubscribing = false;
 	receivingData = false;
diff --git a/sdk/src/slot/SlothashSubscriber.ts b/sdk/src/slot/SlothashSubscriber.ts
@@ -23,7 +23,7 @@ export class SlothashSubscriber {
 	commitment: Commitment;
 
 	// Reconnection
-	timeoutId?: NodeJS.Timeout;
+	timeoutId?: ReturnType<typeof setTimeout>;
 	resubTimeoutMs?: number;
 	isUnsubscribing = false;
 	receivingData = false;
diff --git a/sdk/src/swift/signedMsgUserAccountSubscriber.ts b/sdk/src/swift/signedMsgUserAccountSubscriber.ts
@@ -25,7 +25,7 @@ export class SignedMsgUserOrdersAccountSubscriber {
 	protected driftClient: DriftClient;
 	protected commitment: Commitment;
 	protected resubOpts?: ResubOpts;
-	protected resyncTimeoutId?: NodeJS.Timeout;
+	protected resyncTimeoutId?: ReturnType<typeof setTimeout>;
 	protected resyncIntervalMs?: number;
 	protected decodeFn: (
 		name: string,
diff --git a/sdk/src/swift/swiftOrderSubscriber.ts b/sdk/src/swift/swiftOrderSubscriber.ts
@@ -38,7 +38,7 @@ export type SwiftOrderSubscriberConfig = {
 };
 
 export class SwiftOrderSubscriber {
-	private heartbeatTimeout: NodeJS.Timeout | null = null;
+	private heartbeatTimeout: ReturnType<typeof setTimeout> | null = null;
 	private readonly heartbeatIntervalMs = 60000;
 	private ws: WebSocket | null = null;
 	private driftClient: DriftClient;
diff --git a/sdk/src/userMap/PollingSubscription.ts b/sdk/src/userMap/PollingSubscription.ts
@@ -5,7 +5,7 @@ export class PollingSubscription {
 	private frequency: number;
 	private skipInitialLoad: boolean;
 
-	intervalId?: NodeJS.Timeout;
+	intervalId?: ReturnType<typeof setTimeout>;
 
 	constructor({
 		userMap,
diff --git a/sdk/src/util/TransactionConfirmationManager.ts b/sdk/src/util/TransactionConfirmationManager.ts
@@ -45,7 +45,7 @@ export class TransactionConfirmationManager {
 	private connection: Connection;
 	private pendingConfirmations: Map<string, TransactionConfirmationRequest> =
 		new Map();
-	private intervalId: NodeJS.Timeout | null = null;
+	private intervalId: ReturnType<typeof setTimeout> | null = null;
 
 	constructor(connection: Connection) {
 		this.connection = connection;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export class ClockSubscriber {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Reconnection`
`32`		`- private timeoutId?: NodeJS.Timeout;`
	`32`	`+ private timeoutId?: ReturnType<typeof setTimeout>;`
`33`	`33`	`private resubTimeoutMs?: number;`
`34`	`34`	`private isUnsubscribing = false;`
`35`	`35`	`private receivingData = false;`