From 2d31bda1d78769c0692005d6ad1dbf9168742317 Mon Sep 17 00:00:00 2001
From: tiagosiebler <tiagosiebler@github.com>
Date: Tue, 27 Jun 2023 11:13:54 +0100
Subject: [PATCH] v3.7.1: chore() naming consistency for interface, pass
 through logger for ws url getter

---
 package-lock.json             | 4 ++--
 package.json                  | 2 +-
 src/rest-client-v5.ts         | 8 ++++----
 src/types/request/v5-trade.ts | 4 ++--
 src/util/websocket-util.ts    | 4 +++-
 src/websocket-client.ts       | 7 ++++++-
 webpack/webpack.config.js     | 1 +
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aae5929..e545031 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bybit-api",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bybit-api",
-      "version": "3.7.0",
+      "version": "3.7.1",
       "license": "MIT",
       "dependencies": {
         "axios": "^0.21.0",
diff --git a/package.json b/package.json
index 0ef2f1f..836d4df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bybit-api",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Complete & robust Node.js SDK for Bybit's REST APIs and WebSockets, with TypeScript & strong end to end tests.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/src/rest-client-v5.ts b/src/rest-client-v5.ts
index e521329..9653caa 100644
--- a/src/rest-client-v5.ts
+++ b/src/rest-client-v5.ts
@@ -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);
   }
diff --git a/src/types/request/v5-trade.ts b/src/types/request/v5-trade.ts
index f34f548..3751c38 100644
--- a/src/types/request/v5-trade.ts
+++ b/src/types/request/v5-trade.ts
@@ -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;
diff --git a/src/util/websocket-util.ts b/src/util/websocket-util.ts
index ec69dfa..a2d27f8 100644
--- a/src/util/websocket-util.ts
+++ b/src/util/websocket-util.ts
@@ -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,
       });
diff --git a/src/websocket-client.ts b/src/websocket-client.ts
index 3ecaa96..f48a847 100644
--- a/src/websocket-client.ts
+++ b/src/websocket-client.ts
@@ -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);
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
index f13eab8..75aefc3 100644
--- a/webpack/webpack.config.js
+++ b/webpack/webpack.config.js
@@ -21,6 +21,7 @@ function generateConfig(name) {
       alias: {
         [path.resolve(__dirname, "../lib/util/node-support.js")]:
           path.resolve(__dirname, "../lib/util/browser-support.js"),
+        process: "process/browser",
       }
     },