Merge pull request #624 from tiagosiebler/bumpsfixesupdates

fix(#603): correct unintentionally hardcoded boolean types, bump webpack bundle analyser, cleaning

Author: tiagosiebler

package-lock.json

@@ -58,8 +58,8 @@
     "source-map-loader": "^2.0.2",
     "ts-loader": "^8.0.11",
     "webpack": "^5.102.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-bundle-analyzer": "^4.10.2"
+    "webpack-bundle-analyzer": "^5.1.1",
+    "webpack-cli": "^5.1.4"
   },
   "keywords": [
     "binance",

package.json

@@ -688,9 +688,13 @@ export class CoinMClient extends BaseRestClient {
       return;
     }
 
-    const expectedOrderIdPrefix = `x-${getOrderIdPrefix(apiCategory)}`;
-    if (!params[orderIdProperty].startsWith(expectedOrderIdPrefix)) {
-      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix, params);
+    const expectedOrderIdPrefix1 = `x-${getOrderIdPrefix(apiCategory, 'v1')}`;
+    const expectedOrderIdPrefix2 = `x-${getOrderIdPrefix(apiCategory, 'v2')}`;
+    if (
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix1) ||
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix2)
+    ) {
+      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix2, params);
     }
   }
 }

src/coinm-client.ts

@@ -4525,9 +4525,13 @@ export class MainClient extends BaseRestClient {
       return;
     }
 
-    const expectedOrderIdPrefix = `x-${getOrderIdPrefix(apiCategory)}`;
-    if (!params[orderIdProperty].startsWith(expectedOrderIdPrefix)) {
-      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix, params);
+    const expectedOrderIdPrefix1 = `x-${getOrderIdPrefix(apiCategory, 'v1')}`;
+    const expectedOrderIdPrefix2 = `x-${getOrderIdPrefix(apiCategory, 'v2')}`;
+    if (
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix1) ||
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix2)
+    ) {
+      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix2, params);
     }
   }
 

src/main-client.ts

@@ -812,9 +812,13 @@ export class PortfolioClient extends BaseRestClient {
       return;
     }
 
-    const expectedOrderIdPrefix = `x-${getOrderIdPrefix(apiCategory)}`;
-    if (!params[orderIdProperty].startsWith(expectedOrderIdPrefix)) {
-      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix, params);
+    const expectedOrderIdPrefix1 = `x-${getOrderIdPrefix(apiCategory, 'v1')}`;
+    const expectedOrderIdPrefix2 = `x-${getOrderIdPrefix(apiCategory, 'v2')}`;
+    if (
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix1) ||
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix2)
+    ) {
+      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix2, params);
     }
   }
 

src/portfolio-client.ts

@@ -42,7 +42,7 @@ export interface WsMessageKlineFormatted extends WsSharedBase {
     low: number;
     volume: number;
     trades: number;
-    final: false;
+    final: boolean;
     quoteVolume: number;
     volumeActive: number;
     quoteVolumeActive: number;
@@ -68,7 +68,7 @@ export interface WsMessageContinuousKlineFormatted extends WsSharedBase {
     low: number;
     volume: number;
     trades: number;
-    final: false;
+    final: boolean;
     quoteVolume: number;
     volumeActive: number;
     quoteVolumeActive: number;
@@ -253,8 +253,8 @@ export interface WsMessageSpotUserDataExecutionReportEventFormatted
   tradeTime: number;
   tradeId: number;
   ignoreThis1: number;
-  isOrderOnBook: false;
-  isMaker: false;
+  isOrderOnBook: boolean;
+  isMaker: boolean;
   ignoreThis2: true;
   orderCreationTime: number;
   cummulativeQuoteAssetTransactedQty: number;

src/types/websockets/ws-events-formatted.ts

@@ -561,5 +561,4 @@ export type WsRawMessage =
   | WsMessagePartialBookDepthEventRaw
   | WsMessageDiffBookDepthEventRaw
   | WsMessageForceOrderRaw
-  | WsRawSpotUserDataEventRaw
   | WsMessageIndexPriceUpdateEventRaw;

src/types/websockets/ws-events-raw.ts

@@ -897,9 +897,13 @@ export class USDMClient extends BaseRestClient {
       return;
     }
 
-    const expectedOrderIdPrefix = `x-${getOrderIdPrefix(apiCategory)}`;
-    if (!params[orderIdProperty].startsWith(expectedOrderIdPrefix)) {
-      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix, params);
+    const expectedOrderIdPrefix1 = `x-${getOrderIdPrefix(apiCategory, 'v1')}`;
+    const expectedOrderIdPrefix2 = `x-${getOrderIdPrefix(apiCategory, 'v2')}`;
+    if (
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix1) ||
+      !params[orderIdProperty].startsWith(expectedOrderIdPrefix2)
+    ) {
+      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix2, params);
     }
   }
 }

src/usdm-client.ts

@@ -107,35 +107,38 @@ export type GenericAPIResponse<T = any> = Promise<T>;
 //   throw new Error(msg);
 // }
 
-export function getOrderIdPrefix(network: BinanceBaseUrlKey): string {
+export function getOrderIdPrefix(
+  network: BinanceBaseUrlKey,
+  prefixVersion: 'v1' | 'v2',
+): string {
   switch (network) {
     case 'spot':
     case 'spot1':
     case 'spot2':
     case 'spot3':
     case 'spot4':
-      return 'U5D79M5B';
+      return prefixVersion === 'v2' ? 'QJ6WSMZX' : 'U5D79M5B';
 
     case 'usdm':
     case 'usdmtest':
     case 'coinm':
     case 'coinmtest':
     case 'papi':
-      return '15PC4ZJy';
+      return prefixVersion === 'v2' ? 'r1wQQsTn' : '15PC4ZJy';
 
     case 'voptions':
     case 'voptionstest':
       return '';
 
     default:
       // throwUnhandledSwitch(network, `"${network}" unhandled`);
-      return 'U5D79M5B';
+      return prefixVersion === 'v2' ? 'QJ6WSMZX' : 'U5D79M5B';
   }
 }
 
 export function generateNewOrderId(network: BinanceBaseUrlKey): string {
   const id = nanoid(22); // must pass ^[\.A-Z\:/a-z0-9_-]{1,32}$ with prefix
-  const prefixedId = 'x-' + getOrderIdPrefix(network) + id;
+  const prefixedId = 'x-' + getOrderIdPrefix(network, 'v2') + id;
 
   return prefixedId;
 }
@@ -295,9 +298,17 @@ export function validateWSAPINewClientOID(
       continue;
     }
 
-    const expectedOrderIdPrefix = `x-${getOrderIdPrefix(baseUrlKey)}`;
-    if (!request.params[orderIdProperty].startsWith(expectedOrderIdPrefix)) {
-      logInvalidOrderId(orderIdProperty, expectedOrderIdPrefix, request.params);
+    const expectedOrderIdPrefix1 = `x-${getOrderIdPrefix(baseUrlKey, 'v1')}`;
+    const expectedOrderIdPrefix2 = `x-${getOrderIdPrefix(baseUrlKey, 'v2')}`;
+    if (
+      !request.params[orderIdProperty].startsWith(expectedOrderIdPrefix1) ||
+      !request.params[orderIdProperty].startsWith(expectedOrderIdPrefix2)
+    ) {
+      logInvalidOrderId(
+        orderIdProperty,
+        expectedOrderIdPrefix2,
+        request.params,
+      );
     }
   }
 }