diff --git a/.gitignore b/.gitignore index 39d9736d..8ebb6033 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ localtest.ts repomix.sh doc *.pem +.env diff --git a/package-lock.json b/package-lock.json index d4005f80..561a49f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "binance", - "version": "3.6.10", + "version": "3.6.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "binance", - "version": "3.6.10", + "version": "3.6.11", "license": "MIT", "dependencies": { "@types/ws": "8.18.1", diff --git a/package.json b/package.json index 1c162421..8a779399 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "binance", - "version": "3.6.10", + "version": "3.6.11", "description": "Professional Node.js & JavaScript SDK for Binance REST APIs & WebSockets, with TypeScript & end-to-end tests.", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/util/BaseWSClient.ts b/src/util/BaseWSClient.ts index b0211bba..af46d579 100644 --- a/src/util/BaseWSClient.ts +++ b/src/util/BaseWSClient.ts @@ -259,6 +259,9 @@ export abstract class BaseWebsocketClient< */ protected abstract isAuthOnConnectWsKey(wsKey: TWSKey): boolean; + /** Release resources owned by the concrete client after intentional socket closure. */ + protected abstract onWsCloseCleanup(wsKey: TWSKey): void; + protected abstract isCustomReconnectionNeeded(wsKey: TWSKey): boolean; protected abstract triggerCustomReconnectionWorkflow( @@ -1323,6 +1326,8 @@ export abstract class BaseWebsocketClient< this.emit('reconnecting', { wsKey, event }); } else { // intentional close - clean up + this.onWsCloseCleanup(wsKey); + // clean up any pending promises for this connection this.logger.trace( `onWsClose(${wsKey}): rejecting all deferred promises...`, diff --git a/src/util/typeGuards.ts b/src/util/typeGuards.ts index 87bdd435..303806ec 100644 --- a/src/util/typeGuards.ts +++ b/src/util/typeGuards.ts @@ -67,6 +67,9 @@ export function isWsFuturesConnection(data: WsFormattedMessage): boolean { } export function isWSAPIWsKey(wsKey: WsKey): wsKey is WSAPIWsKey { + // Listen-key subscriptions use derived keys rather than the static WsKey names. + if (wsKey.includes('_userData_')) return false; + switch (wsKey) { case 'mainWSAPITestnet': case 'mainWSAPI': diff --git a/src/websocket-client.ts b/src/websocket-client.ts index a4ce30c5..d2dfbb93 100644 --- a/src/websocket-client.ts +++ b/src/websocket-client.ts @@ -158,6 +158,15 @@ export class WebsocketClient extends BaseWebsocketClient< }); } + protected onWsCloseCleanup(wsKey: WsKey): void { + const context = getLegacyWsKeyContext(wsKey); + if (context && context?.listenKey) { + this.getUserDataStreamManager().teardownUserDataListenKey( + context.listenKey, + ); + } + } + private getUserDataStreamManager(): UserDataStreamManager { return this.userDataStreamManager; }