v3.7.1: chore() naming consistency for interface, pass through logger for ws url getter

This commit is contained in:
tiagosiebler
2023-06-27 11:13:54 +01:00
parent b12f243a3d
commit 2d31bda1d7
7 changed files with 19 additions and 11 deletions

View File

@@ -46,8 +46,8 @@ import {
FeeRateV5,
FundingRateHistoryResponseV5,
GetAccountCoinBalanceParamsV5,
GetAccountHistoricOrdersPArams,
GetAccountOrdersParams,
GetAccountHistoricOrdersParamsV5,
GetAccountOrdersParamsV5,
GetAllCoinsBalanceParamsV5,
GetAllowedDepositCoinInfoParamsV5,
GetAssetInfoParamsV5,
@@ -392,7 +392,7 @@ export class RestClientV5 extends BaseRestClient {
* Query unfilled or partially filled orders in real-time. To query older order records, please use the order history interface.
*/
getActiveOrders(
params: GetAccountOrdersParams,
params: GetAccountOrdersParamsV5,
): Promise<APIResponseV3WithTime<CategoryCursorListV5<AccountOrderV5[]>>> {
return this.getPrivate('/v5/order/realtime', params);
}
@@ -409,7 +409,7 @@ export class RestClientV5 extends BaseRestClient {
* If you want to get real-time order information, you could query this endpoint or rely on the websocket stream (recommended).
*/
getHistoricOrders(
params: GetAccountHistoricOrdersPArams,
params: GetAccountHistoricOrdersParamsV5,
): Promise<APIResponseV3WithTime<CategoryCursorListV5<AccountOrderV5[]>>> {
return this.getPrivate('/v5/order/history', params);
}

View File

@@ -67,7 +67,7 @@ export interface CancelOrderParamsV5 {
orderFilter?: OrderFilterV5;
}
export interface GetAccountOrdersParams {
export interface GetAccountOrdersParamsV5 {
category: CategoryV5;
symbol?: string;
baseCoin?: string;
@@ -81,7 +81,7 @@ export interface GetAccountOrdersParams {
cursor?: string;
}
export interface GetAccountHistoricOrdersPArams {
export interface GetAccountHistoricOrdersParamsV5 {
category: CategoryV5;
symbol?: string;
baseCoin?: string;

View File

@@ -1,4 +1,5 @@
import { APIMarket, CategoryV5, WsKey } from '../types';
import { DefaultLogger } from './logger';
interface NetworkMapV3 {
livenet: string;
@@ -397,6 +398,7 @@ export function getWsUrl(
wsKey: WsKey,
wsUrl: string | undefined,
isTestnet: boolean,
logger: typeof DefaultLogger,
): string {
if (wsUrl) {
return wsUrl;
@@ -479,7 +481,7 @@ export function getWsUrl(
return WS_BASE_URL_MAP.v5OptionPublic.public[networkKey];
}
default: {
this.logger.error('getWsUrl(): Unhandled wsKey: ', {
logger.error('getWsUrl(): Unhandled wsKey: ', {
category: 'bybit-ws',
wsKey,
});

View File

@@ -621,7 +621,12 @@ export class WebsocketClient extends EventEmitter {
}
const authParams = await this.getAuthParams(wsKey);
const url = getWsUrl(wsKey, this.options.wsUrl, this.isTestnet());
const url = getWsUrl(
wsKey,
this.options.wsUrl,
this.isTestnet(),
this.logger,
);
const ws = this.connectToWsUrl(url + authParams, wsKey);
return this.wsStore.setWs(wsKey, ws);