@solncebro/exchange-engine 0.1.1 → 0.2.0

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export type { ExchangeName, OrderSide, OrderType, MarginMode, PositionSide, MarketType, TimeInForce, KlineInterval, ExchangeConfig, ExchangeLogger, Ticker, TickerBySymbol, Kline, MarketFilter, Market, MarketBySymbol, Position, Order, Balance, BalanceByAsset, } from './common';
-export type { ExchangeArgs, CreateOrderWsArgs, FetchKlinesArgs, SubscribeKlinesArgs, ExchangeClient, } from './exchange';
+export type { ExchangeName, OrderSide, OrderType, MarginMode, PositionSide, TradeSymbolType, TimeInForce, KlineInterval, ExchangeConfig, ExchangeLogger, Ticker, TickerBySymbol, Kline, TradeSymbolFilter, TradeSymbol, TradeSymbolBySymbol, Position, Order, Balance, BalanceByAsset, FundingRateHistory, } from './common';
+export type { ExchangeArgs, CreateOrderWebSocketArgs, FetchPageWithLimitArgs, SubscribeKlinesArgs, ExchangeClient, } from './exchange';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,cAAc,EACd,MAAM,EACN,cAAc,EACd,KAAK,EACL,YAAY,EACZ,MAAM,EACN,cAAc,EACd,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,GACf,MAAM,UAAU,CAAC;AAElB,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,cAAc,GACf,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,YAAY,EACZ,eAAe,EACf,WAAW,EACX,aAAa,EACb,cAAc,EACd,cAAc,EACd,MAAM,EACN,cAAc,EACd,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,cAAc,EACd,kBAAkB,GACnB,MAAM,UAAU,CAAC;AAElB,YAAY,EACV,YAAY,EACZ,wBAAwB,EACxB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,GACf,MAAM,YAAY,CAAC"}

package/dist/types/stream.d.ts

@@ -0,0 +1,9 @@
+import type { KlineInterval, TickerBySymbol } from './common';
+import type { KlineHandler } from './exchange';
+export interface PublicStreamLike {
+    subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
+    subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
+    unsubscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
+    close(): void;
+}
+//# sourceMappingURL=stream.d.ts.map

package/dist/types/stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/types/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,gBAAgB;IAC/B,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI,CAAC;IACtE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IACtF,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IACxF,KAAK,IAAI,IAAI,CAAC;CACf"}

package/dist/types/stream.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=stream.js.map

package/dist/types/stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/types/stream.ts"],"names":[],"mappings":""}

package/dist/utils/crypto.d.ts

@@ -0,0 +1,2 @@
+export declare function hmacSha256(payload: string, secret: string): string;
+//# sourceMappingURL=crypto.d.ts.map

package/dist/utils/crypto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/utils/crypto.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAElE"}

package/dist/utils/crypto.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hmacSha256 = hmacSha256;
+const node_crypto_1 = __importDefault(require("node:crypto"));
+function hmacSha256(payload, secret) {
+    return node_crypto_1.default.createHmac('sha256', secret).update(payload).digest('hex');
+}
+//# sourceMappingURL=crypto.js.map

package/dist/utils/crypto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/utils/crypto.ts"],"names":[],"mappings":";;;;;AAEA,gCAEC;AAJD,8DAAiC;AAEjC,SAAgB,UAAU,CAAC,OAAe,EAAE,MAAc;IACxD,OAAO,qBAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC3E,CAAC"}

package/dist/utils/httpParams.d.ts

@@ -0,0 +1,3 @@
+import type { FetchPageWithLimitArgs } from '../types/exchange';
+export declare function applyTimeRangeOptions(params: Record<string, string | number | boolean>, options?: FetchPageWithLimitArgs): void;
+//# sourceMappingURL=httpParams.d.ts.map

package/dist/utils/httpParams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpParams.d.ts","sourceRoot":"","sources":["../../src/utils/httpParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EACjD,OAAO,CAAC,EAAE,sBAAsB,GAC/B,IAAI,CAYN"}

package/dist/utils/httpParams.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyTimeRangeOptions = applyTimeRangeOptions;
+function applyTimeRangeOptions(params, options) {
+    if (options?.startTime !== undefined) {
+        params.startTime = options.startTime;
+    }
+    if (options?.endTime !== undefined) {
+        params.endTime = options.endTime;
+    }
+    if (options?.limit !== undefined) {
+        params.limit = options.limit;
+    }
+}
+//# sourceMappingURL=httpParams.js.map

package/dist/utils/httpParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpParams.js","sourceRoot":"","sources":["../../src/utils/httpParams.ts"],"names":[],"mappings":";;AAEA,sDAeC;AAfD,SAAgB,qBAAqB,CACnC,MAAiD,EACjD,OAAgC;IAEhC,IAAI,OAAO,EAAE,SAAS,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACvC,CAAC;IAED,IAAI,OAAO,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;AACH,CAAC"}

package/dist/utils/klineLoader.d.ts

@@ -0,0 +1,10 @@
+import type { ExchangeLogger, Kline } from '../types/common';
+export declare const KLINE_CHUNK_SIZE = 200;
+export interface LoadKlinesInChunksArgs {
+    fetchKlines: (symbol: string) => Promise<Kline[]>;
+    symbolList: string[];
+    logger: ExchangeLogger;
+    chunkSize?: number;
+}
+export declare function loadKlinesInChunks(args: LoadKlinesInChunksArgs): Promise<Map<string, Kline[]>>;
+//# sourceMappingURL=klineLoader.d.ts.map

package/dist/utils/klineLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"klineLoader.d.ts","sourceRoot":"","sources":["../../src/utils/klineLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7D,eAAO,MAAM,gBAAgB,MAAM,CAAC;AAEpC,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAClD,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAmBpG"}

package/dist/utils/klineLoader.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KLINE_CHUNK_SIZE = void 0;
+exports.loadKlinesInChunks = loadKlinesInChunks;
+exports.KLINE_CHUNK_SIZE = 200;
+async function loadKlinesInChunks(args) {
+    const { fetchKlines, symbolList, logger, chunkSize = exports.KLINE_CHUNK_SIZE } = args;
+    const klineListBySymbol = new Map();
+    for (let i = 0; i < symbolList.length; i += chunkSize) {
+        const chunk = symbolList.slice(i, i + chunkSize);
+        const chunkResultList = await Promise.all(chunk.map(async (symbol) => ({ symbol, klineList: await fetchKlines(symbol) })));
+        for (const { symbol, klineList } of chunkResultList) {
+            klineListBySymbol.set(symbol, klineList);
+        }
+        logger.info(`Loaded klines for ${Math.min(i + chunkSize, symbolList.length)}/${symbolList.length} symbols`);
+    }
+    return klineListBySymbol;
+}
+//# sourceMappingURL=klineLoader.js.map

package/dist/utils/klineLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"klineLoader.js","sourceRoot":"","sources":["../../src/utils/klineLoader.ts"],"names":[],"mappings":";;;AAWA,gDAmBC;AA5BY,QAAA,gBAAgB,GAAG,GAAG,CAAC;AAS7B,KAAK,UAAU,kBAAkB,CAAC,IAA4B;IACnE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,GAAG,wBAAgB,EAAE,GAAG,IAAI,CAAC;IAC/E,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAC;IAErD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;QAEjD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAChF,CAAC;QAEF,KAAK,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,eAAe,EAAE,CAAC;YACpD,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;IAC9G,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/dist/ws/BinanceFuturesPublicStream.d.ts

@@ -1,28 +1,29 @@
-import type { ExchangeLogger, Kline, KlineInterval, TickerBySymbol } from '../types/common';
+import type { ExchangeLogger, KlineInterval, TickerBySymbol } from '../types/common';
+import type { KlineHandler } from '../types/exchange';
 interface BinanceCombinedMessage {
     stream?: string;
     data?: unknown;
 }
 declare class BinanceFuturesPublicStream {
+    private readonly webSocketCombinedUrl;
     private readonly logger;
     private readonly onNotify?;
     private readonly tickerHandlerSet;
     private readonly klineHandlerByKey;
-    private readonly connections;
-    private connectScheduled;
+    private readonly connectionList;
+    private isConnectScheduled;
     private subscriptionIdCounter;
-    constructor(logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
+    constructor(webSocketCombinedUrl: string, logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
     subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
     unsubscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
-    subscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
-    unsubscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
+    subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
+    unsubscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
     close(): void;
     private scheduleConnect;
     private createConnections;
     private createConnection;
     private addStreamToConnection;
     private removeStreamFromConnection;
-    private sendSubscribe;
     private handleMessage;
 }
 export { BinanceFuturesPublicStream };

package/dist/ws/BinanceFuturesPublicStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BinanceFuturesPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAO5F,UAAU,sBAAsB;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAmCD,cAAM,0BAA0B;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuD;IACzF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IACvD,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxF,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAKrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAIvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAkB/F,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAmBjG,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;CAsCtB;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC;AACtC,YAAY,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"BinanceFuturesPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOtD,UAAU,sBAAsB;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA0BD,cAAM,0BAA0B;IAC9B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;IAC/E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;IAC1D,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtH,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAKrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAIvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAgBrF,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAmBvF,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,aAAa;CAsCtB;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC;AACtC,YAAY,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/ws/BinanceFuturesPublicStream.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinanceFuturesPublicStream = void 0;
 const websocket_engine_1 = require("@solncebro/websocket-engine");
 const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
-const binance_1 = require("../constants/binance");
+const binanceWebSocketUtils_1 = require("./binanceWebSocketUtils");
 const MAX_STREAMS_PER_CONNECTION = 200;
 function parseBinanceCombinedMessage(rawData) {
     return JSON.parse(rawData.toString());
@@ -14,28 +14,22 @@ function buildKlineStreamList(klineHandlerByKey) {
         const separatorIndex = key.lastIndexOf('_');
         const symbol = key.slice(0, separatorIndex);
         const interval = key.slice(separatorIndex + 1);
-        const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+        const binanceInterval = interval;
         streamList.push(`${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`);
     }
     return streamList;
 }
-function resolveUnifiedInterval(binanceInterval) {
-    for (const [unified, binance] of Object.entries(binance_1.BINANCE_KLINE_INTERVAL)) {
-        if (binance === binanceInterval) {
-            return unified;
-        }
-    }
-    return '1m';
-}
 class BinanceFuturesPublicStream {
+    webSocketCombinedUrl;
     logger;
     onNotify;
     tickerHandlerSet = new Set();
     klineHandlerByKey = new Map();
-    connections = [];
-    connectScheduled = false;
+    connectionList = [];
+    isConnectScheduled = false;
     subscriptionIdCounter = 1;
-    constructor(logger, onNotify) {
+    constructor(webSocketCombinedUrl, logger, onNotify) {
+        this.webSocketCombinedUrl = webSocketCombinedUrl;
         this.logger = logger;
         this.onNotify = onNotify;
     }
@@ -48,12 +42,11 @@ class BinanceFuturesPublicStream {
     }
     subscribeKlines(symbol, interval, handler) {
         const key = `${symbol}_${interval}`;
-        if (!this.klineHandlerByKey.has(key)) {
-            this.klineHandlerByKey.set(key, new Set());
-        }
-        this.klineHandlerByKey.get(key).add(handler);
-        if (this.connections.length > 0) {
-            const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+        const handlerSet = this.klineHandlerByKey.get(key) ?? new Set();
+        handlerSet.add(handler);
+        this.klineHandlerByKey.set(key, handlerSet);
+        if (this.connectionList.length > 0) {
+            const binanceInterval = interval;
             const stream = `${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`;
             this.addStreamToConnection(stream);
         }
@@ -70,116 +63,93 @@ class BinanceFuturesPublicStream {
         handlerSet.delete(handler);
         if (handlerSet.size === 0) {
             this.klineHandlerByKey.delete(key);
-            const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+            const binanceInterval = interval;
             const stream = `${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`;
             this.removeStreamFromConnection(stream);
         }
     }
     close() {
-        for (const conn of this.connections) {
-            conn.ws.close();
+        for (const connection of this.connectionList) {
+            connection.webSocket.close();
         }
-        this.connections.length = 0;
+        this.connectionList.length = 0;
     }
     scheduleConnect() {
-        if (this.connectScheduled || this.connections.length > 0) {
+        if (this.isConnectScheduled || this.connectionList.length > 0) {
             return;
         }
-        this.connectScheduled = true;
+        this.isConnectScheduled = true;
         queueMicrotask(() => {
-            this.connectScheduled = false;
+            this.isConnectScheduled = false;
             this.createConnections();
         });
     }
     createConnections() {
-        const tickerStreams = this.tickerHandlerSet.size > 0 ? ['!miniTicker@arr'] : [];
-        const klineStreams = buildKlineStreamList(this.klineHandlerByKey);
-        const allStreams = [...tickerStreams, ...klineStreams];
-        if (allStreams.length === 0) {
+        const tickerStreamList = this.tickerHandlerSet.size > 0 ? ['!miniTicker@arr'] : [];
+        const klineStreamList = buildKlineStreamList(this.klineHandlerByKey);
+        const allStreamList = [...tickerStreamList, ...klineStreamList];
+        if (allStreamList.length === 0) {
             return;
         }
-        for (let i = 0; i < allStreams.length; i += MAX_STREAMS_PER_CONNECTION) {
-            const chunk = allStreams.slice(i, i + MAX_STREAMS_PER_CONNECTION);
-            this.createConnection(chunk);
+        for (let i = 0; i < allStreamList.length; i += MAX_STREAMS_PER_CONNECTION) {
+            const streamChunk = allStreamList.slice(i, i + MAX_STREAMS_PER_CONNECTION);
+            this.createConnection(streamChunk, this.connectionList.length);
         }
-        this.logger.info(`BinanceFuturesPublicStream: created ${this.connections.length} connection(s) for ${allStreams.length} streams`);
+        this.logger.info(`BinanceFuturesPublicStream: created ${this.connectionList.length} connection(s) for ${allStreamList.length} streams`);
     }
-    createConnection(streams) {
-        const conn = { ws: null, streams };
-        conn.ws = new websocket_engine_1.ReliableWebSocket({
-            label: 'BinanceFuturesPublicStream',
-            url: binance_1.BINANCE_FUTURES_WS_COMBINED_URL,
+    createConnection(streamList, index) {
+        const label = `BinanceFuturesPublicStream-${index}`;
+        const url = `${this.webSocketCombinedUrl}?streams=${streamList.join('/')}`;
+        const webSocket = new websocket_engine_1.ReliableWebSocket({
+            label,
+            url,
             logger: this.logger,
             parseMessage: parseBinanceCombinedMessage,
             onMessage: (message) => this.handleMessage(message),
-            onOpen: async () => {
-                this.logger.info(`BinanceFuturesPublicStream connected (${conn.streams.length} streams)`);
-                this.sendSubscribe(conn);
-            },
-            onReconnectSuccess: () => this.sendSubscribe(conn),
             onNotify: this.onNotify,
-            heartbeat: {
-                buildPayload: () => ({ method: 'PING' }),
-                isResponse: (message) => {
-                    const raw = message;
-                    return raw['id'] !== undefined && raw['result'] === null;
-                },
-            },
             configuration: {
                 pingInterval: 30000,
             },
         });
-        this.connections.push(conn);
+        this.connectionList.push({ webSocket, label, streamList });
     }
     addStreamToConnection(stream) {
-        let targetConn = this.connections.find((c) => c.streams.length < MAX_STREAMS_PER_CONNECTION);
-        if (!targetConn) {
-            this.createConnection([stream]);
+        let targetConnection = this.connectionList.find((connection) => connection.streamList.length < MAX_STREAMS_PER_CONNECTION);
+        if (!targetConnection) {
+            this.createConnection([stream], this.connectionList.length);
             return;
         }
-        targetConn.streams.push(stream);
+        targetConnection.streamList.push(stream);
         try {
-            targetConn.ws.sendToConnectedSocket({
+            targetConnection.webSocket.sendToConnectedSocket({
                 method: 'SUBSCRIBE',
                 params: [stream],
                 id: this.subscriptionIdCounter++,
             });
         }
         catch {
-            // Will be subscribed on reconnect
+            this.logger.warn('BinanceFuturesPublicStream: failed to subscribe, socket not connected');
         }
     }
     removeStreamFromConnection(stream) {
-        for (const conn of this.connections) {
-            const idx = conn.streams.indexOf(stream);
-            if (idx !== -1) {
-                conn.streams.splice(idx, 1);
+        for (const connection of this.connectionList) {
+            const index = connection.streamList.indexOf(stream);
+            if (index !== -1) {
+                connection.streamList.splice(index, 1);
                 try {
-                    conn.ws.sendToConnectedSocket({
+                    connection.webSocket.sendToConnectedSocket({
                         method: 'UNSUBSCRIBE',
                         params: [stream],
                         id: this.subscriptionIdCounter++,
                     });
                 }
                 catch {
-                    // Will be reflected on reconnect
+                    this.logger.warn('BinanceFuturesPublicStream: failed to unsubscribe, socket not connected');
                 }
                 break;
             }
         }
     }
-    sendSubscribe(conn) {
-        try {
-            conn.ws.sendToConnectedSocket({
-                method: 'SUBSCRIBE',
-                params: conn.streams,
-                id: this.subscriptionIdCounter++,
-            });
-        }
-        catch {
-            this.logger.warn('BinanceFuturesPublicStream: failed to subscribe, socket not connected');
-        }
-    }
     handleMessage(message) {
         if (message.data === undefined) {
             return;
@@ -196,17 +166,17 @@ class BinanceFuturesPublicStream {
             if (!klineRaw) {
                 return;
             }
-            const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWsMessage)(klineRaw);
+            const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWebSocketMessage)(klineRaw);
             const continuousKlineIndex = message.stream.indexOf('@continuousKline_');
             const symbolLower = message.stream.slice(0, continuousKlineIndex).replace(/_perpetual$/, '');
             const symbol = symbolLower.toUpperCase();
             const binanceInterval = message.stream.slice(continuousKlineIndex + '@continuousKline_'.length);
-            const unifiedInterval = resolveUnifiedInterval(binanceInterval);
+            const unifiedInterval = (0, binanceWebSocketUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
             const key = `${symbol}_${unifiedInterval}`;
             const handlerSet = this.klineHandlerByKey.get(key);
             if (handlerSet) {
                 for (const handler of handlerSet) {
-                    handler(kline);
+                    handler(symbol, kline);
                 }
             }
         }

package/dist/ws/BinanceFuturesPublicStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"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"}

package/dist/ws/BinanceSpotPublicStream.d.ts

@@ -1,16 +1,18 @@
-import type { ExchangeLogger, Kline, KlineInterval, TickerBySymbol } from '../types/common';
+import type { ExchangeLogger, KlineInterval, TickerBySymbol } from '../types/common';
+import type { KlineHandler } from '../types/exchange';
 declare class BinanceSpotPublicStream {
-    private ws;
+    private webSocket;
+    private readonly webSocketUrl;
     private readonly logger;
     private readonly onNotify?;
     private readonly tickerHandlerSet;
     private readonly klineHandlerByKey;
     private subscriptionIdCounter;
-    constructor(logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
+    constructor(webSocketUrl: string, logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
     subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
     unsubscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
-    subscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
-    unsubscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
+    subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
+    unsubscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
     close(): void;
     private ensureConnected;
     private handleOpen;

package/dist/ws/BinanceSpotPublicStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA0B5F,cAAM,uBAAuB;IAC3B,OAAO,CAAC,EAAE,CAAyD;IACnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuD;IACzF,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxF,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAKrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAIvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAkB/F,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAqBjG,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;YAwBT,UAAU;IAKxB,OAAO,CAAC,aAAa;IA8BrB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,cAAc;IAoBtB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,eAAe;CAWxB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAgBtD,cAAM,uBAAuB;IAC3B,OAAO,CAAC,SAAS,CAAgE;IACjF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;IAC/E,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9G,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAKrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAIvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAgBrF,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAqBvF,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;YAwBT,UAAU;IAKxB,OAAO,CAAC,aAAa;IA8BrB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,cAAc;IAoBtB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,eAAe;CAWxB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/ws/BinanceSpotPublicStream.js

@@ -3,26 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinanceSpotPublicStream = void 0;
 const websocket_engine_1 = require("@solncebro/websocket-engine");
 const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
-const binance_1 = require("../constants/binance");
+const binanceWebSocketUtils_1 = require("./binanceWebSocketUtils");
 function parseBinanceSpotMessage(rawData) {
     return JSON.parse(rawData.toString());
 }
-function resolveUnifiedInterval(binanceInterval) {
-    for (const [unified, binance] of Object.entries(binance_1.BINANCE_KLINE_INTERVAL)) {
-        if (binance === binanceInterval) {
-            return unified;
-        }
-    }
-    return '1m';
-}
 class BinanceSpotPublicStream {
-    ws = null;
+    webSocket = null;
+    webSocketUrl;
     logger;
     onNotify;
     tickerHandlerSet = new Set();
     klineHandlerByKey = new Map();
     subscriptionIdCounter = 1;
-    constructor(logger, onNotify) {
+    constructor(webSocketUrl, logger, onNotify) {
+        this.webSocketUrl = webSocketUrl;
         this.logger = logger;
         this.onNotify = onNotify;
     }
@@ -35,12 +29,11 @@ class BinanceSpotPublicStream {
     }
     subscribeKlines(symbol, interval, handler) {
         const key = `${symbol}_${interval}`;
-        if (!this.klineHandlerByKey.has(key)) {
-            this.klineHandlerByKey.set(key, new Set());
-        }
-        this.klineHandlerByKey.get(key).add(handler);
-        if (this.ws !== null) {
-            const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+        const handlerSet = this.klineHandlerByKey.get(key) ?? new Set();
+        handlerSet.add(handler);
+        this.klineHandlerByKey.set(key, handlerSet);
+        if (this.webSocket !== null) {
+            const binanceInterval = interval;
             const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
             this.sendSubscribe([stream]);
         }
@@ -57,26 +50,26 @@ class BinanceSpotPublicStream {
         handlerSet.delete(handler);
         if (handlerSet.size === 0) {
             this.klineHandlerByKey.delete(key);
-            if (this.ws !== null) {
-                const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+            if (this.webSocket !== null) {
+                const binanceInterval = interval;
                 const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
                 this.sendUnsubscribe([stream]);
             }
         }
     }
     close() {
-        if (this.ws !== null) {
-            this.ws.close();
-            this.ws = null;
+        if (this.webSocket !== null) {
+            this.webSocket.close();
+            this.webSocket = null;
         }
     }
     ensureConnected() {
-        if (this.ws !== null) {
+        if (this.webSocket !== null) {
             return;
         }
-        this.ws = new websocket_engine_1.ReliableWebSocket({
+        this.webSocket = new websocket_engine_1.ReliableWebSocket({
             label: 'BinanceSpotPublicStream',
-            url: binance_1.BINANCE_SPOT_WS_STREAM_URL,
+            url: this.webSocketUrl,
             logger: this.logger,
             parseMessage: parseBinanceSpotMessage,
             onMessage: (message) => this.handleMessage(message),
@@ -127,17 +120,17 @@ class BinanceSpotPublicStream {
         if (!klineRaw) {
             return;
         }
-        const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWsMessage)(klineRaw);
+        const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWebSocketMessage)(klineRaw);
         const atIndex = stream.indexOf('@kline_');
         const symbolLower = stream.slice(0, atIndex);
         const binanceInterval = stream.slice(atIndex + '@kline_'.length);
         const symbol = symbolLower.toUpperCase();
-        const unifiedInterval = resolveUnifiedInterval(binanceInterval);
+        const unifiedInterval = (0, binanceWebSocketUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
         const key = `${symbol}_${unifiedInterval}`;
         const handlerSet = this.klineHandlerByKey.get(key);
         if (handlerSet) {
             for (const handler of handlerSet) {
-                handler(kline);
+                handler(symbol, kline);
             }
         }
     }
@@ -150,7 +143,7 @@ class BinanceSpotPublicStream {
             const separatorIndex = key.lastIndexOf('_');
             const symbol = key.slice(0, separatorIndex);
             const interval = key.slice(separatorIndex + 1);
-            const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
+            const binanceInterval = interval;
             streamList.push(`${symbol.toLowerCase()}@kline_${binanceInterval}`);
         }
         if (streamList.length > 0) {
@@ -159,7 +152,7 @@ class BinanceSpotPublicStream {
     }
     sendSubscribe(streamList) {
         try {
-            this.ws.sendToConnectedSocket({
+            this.webSocket?.sendToConnectedSocket({
                 method: 'SUBSCRIBE',
                 params: streamList,
                 id: this.subscriptionIdCounter++,
@@ -171,7 +164,7 @@ class BinanceSpotPublicStream {
     }
     sendUnsubscribe(streamList) {
         try {
-            this.ws.sendToConnectedSocket({
+            this.webSocket?.sendToConnectedSocket({
                 method: 'UNSUBSCRIBE',
                 params: streamList,
                 id: this.subscriptionIdCounter++,