@binance/common 1.0.1 → 1.0.2

package/dist/index.mjs

@@ -251,8 +251,7 @@ import fs from "fs";
 import https from "https";
 import globalAxios from "axios";
 function buildQueryString(params) {
-  if (!params)
-    return "";
+  if (!params) return "";
   return Object.entries(params).map(stringifyKeyValuePair).join("&");
 }
 function stringifyKeyValuePair([key, value]) {
@@ -320,8 +319,7 @@ var assertParamExists = function(functionName, paramName, paramValue) {
   }
 };
 function setFlattenedQueryParams(urlSearchParams, parameter, key = "") {
-  if (parameter == null)
-    return;
+  if (parameter == null) return;
   if (typeof parameter === "object") {
     if (Array.isArray(parameter)) {
       parameter.forEach((item) => setFlattenedQueryParams(urlSearchParams, item, key));
@@ -433,8 +431,7 @@ var httpRequestFunction = async function(axiosArgs, configuration) {
         } else {
           if (retries > 0 && attempt >= retries)
             lastError = new Error(`Request failed after ${retries} retries`);
-          else
-            lastError = new NetworkError("Network error or request timeout.");
+          else lastError = new NetworkError("Network error or request timeout.");
           break;
         }
       }
@@ -446,8 +443,7 @@ var parseRateLimitHeaders = function(headers) {
   const rateLimits = [];
   const parseIntervalDetails = (key) => {
     const match = key.match(/x-mbx-used-weight-(\d+)([smhd])|x-mbx-order-count-(\d+)([smhd])/i);
-    if (!match)
-      return null;
+    if (!match) return null;
     const intervalNum = parseInt(match[1] || match[3], 10);
     const intervalLetter = (match[2] || match[4])?.toUpperCase();
     let interval;
@@ -471,8 +467,7 @@ var parseRateLimitHeaders = function(headers) {
   };
   for (const [key, value] of Object.entries(headers)) {
     const normalizedKey = key.toLowerCase();
-    if (value === void 0)
-      continue;
+    if (value === void 0) continue;
     if (normalizedKey.startsWith("x-mbx-used-weight-")) {
       const details = parseIntervalDetails(normalizedKey);
       if (details) {
@@ -535,8 +530,7 @@ var sendRequest = function(configuration, endpoint, method, params = {}, timeUni
   );
 };
 function removeEmptyValue(obj) {
-  if (!(obj instanceof Object))
-    return {};
+  if (!(obj instanceof Object)) return {};
   return Object.fromEntries(
     Object.entries(obj).filter(
       ([, value]) => value !== null && value !== void 0 && value !== ""
@@ -552,12 +546,13 @@ function sortObject(obj) {
 function replaceWebsocketStreamsPlaceholders(str, variables) {
   const normalizedVariables = Object.keys(variables).reduce(
     (acc, key) => {
-      acc[key.toLowerCase().replace(/[-_]/g, "")] = variables[key];
+      const normalizedKey = key.toLowerCase().replace(/[-_]/g, "");
+      acc[normalizedKey] = variables[key];
       return acc;
     },
     {}
   );
-  return str.replace(/<([^>]+)>/g, (match, fieldName) => {
+  return str.replace(/(@)?<([^>]+)>/g, (match, precedingAt, fieldName) => {
     const normalizedFieldName = fieldName.toLowerCase().replace(/[-_]/g, "");
     if (Object.prototype.hasOwnProperty.call(normalizedVariables, normalizedFieldName) && normalizedVariables[normalizedFieldName] != null) {
       const value = normalizedVariables[normalizedFieldName];
@@ -568,7 +563,7 @@ function replaceWebsocketStreamsPlaceholders(str, variables) {
         case "updatespeed":
           return `@${value}`;
         default:
-          return value;
+          return (precedingAt || "") + value;
       }
     }
     return "";
@@ -614,7 +609,7 @@ var WebsocketEventEmitter = class {
     this.eventEmitter.emit(event, ...args);
   }
 };
-var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
+var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
   constructor(configuration, connectionPool = []) {
     super();
     this.configuration = configuration;
@@ -626,8 +621,10 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     this.connectionPool = connectionPool;
     this.mode = this.configuration?.mode ?? "single";
     this.poolSize = this.mode === "pool" && this.configuration?.poolSize ? this.configuration.poolSize : 1;
-    if (!connectionPool || connectionPool.length === 0)
-      this.initializePool(this.poolSize);
+    if (!connectionPool || connectionPool.length === 0) this.initializePool(this.poolSize);
+  }
+  static {
+    this.MAX_CONNECTION_DURATION = 23 * 60 * 60 * 1e3;
   }
   /**
    * Initializes the WebSocket connection pool by creating a specified number of connection objects
@@ -659,8 +656,7 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    * @returns {WebsocketConnection} The selected WebSocket connection.
    */
   getConnection(allowNonEstablishedWebsockets = false) {
-    if (this.mode === "single")
-      return this.connectionPool[0];
+    if (this.mode === "single") return this.connectionPool[0];
     const availableConnections = this.connectionPool.filter(
       (connection) => this.isConnectionReady(connection, allowNonEstablishedWebsockets)
     );
@@ -705,10 +701,8 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     const timers = this.connectionTimers.get(connection);
     if (timers) {
       timers.forEach(({ timer, type }) => {
-        if (type === "timeout")
-          clearTimeout(timer);
-        else if (type === "interval")
-          clearInterval(timer);
+        if (type === "timeout") clearTimeout(timer);
+        else if (type === "interval") clearInterval(timer);
       });
       this.connectionTimers.delete(connection);
     }
@@ -724,8 +718,7 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    * @returns A Promise that resolves when the queue has been fully processed.
    */
   async processQueue(throttleRate = 1e3) {
-    if (this.queueProcessing)
-      return;
+    if (this.queueProcessing) return;
     this.queueProcessing = true;
     while (this.connectionQueue.length > 0) {
       const { connection, url, isRenewal } = this.connectionQueue.shift();
@@ -758,8 +751,7 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    * @returns Promise that resolves when the connection is closed.
    */
   async closeConnectionGracefully(WebsocketConnectionToClose, connection) {
-    if (!WebsocketConnectionToClose || !connection)
-      return;
+    if (!WebsocketConnectionToClose || !connection) return;
     this.logger.debug("Waiting for pending requests to complete before disconnecting.");
     const closePromise = new Promise((resolve) => {
       this.scheduleTimer(
@@ -892,10 +884,8 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     this.logger.info(
       `Establishing Websocket connection with id ${targetConnection.id} to: ${url}`
     );
-    if (isRenewal)
-      targetConnection.renewalPending = true;
-    else
-      targetConnection.ws = ws;
+    if (isRenewal) targetConnection.renewalPending = true;
+    else targetConnection.ws = ws;
     this.scheduleTimer(
       ws,
       () => {
@@ -910,8 +900,7 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     );
     ws.on("open", () => {
       const oldWSConnection = targetConnection.ws;
-      if (targetConnection.renewalPending)
-        targetConnection.ws = ws;
+      if (targetConnection.renewalPending) targetConnection.ws = ws;
       this.onOpen(url, targetConnection, oldWSConnection);
     });
     ws.on("message", (data) => {
@@ -975,8 +964,7 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    * @throws Error if the WebSocket client is not set.
    */
   async disconnect() {
-    if (!this.isConnected())
-      this.logger.warn("No connection to close.");
+    if (!this.isConnected()) this.logger.warn("No connection to close.");
     else {
       this.connectionPool.forEach((connection) => {
         connection.closeInitiated = true;
@@ -1026,25 +1014,20 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     if (!this.isConnected(connection)) {
       const errorMsg = "Send can only be sent when connection is ready.";
       this.logger.warn(errorMsg);
-      if (promiseBased)
-        return Promise.reject(new Error(errorMsg));
-      else
-        throw new Error(errorMsg);
+      if (promiseBased) return Promise.reject(new Error(errorMsg));
+      else throw new Error(errorMsg);
     }
     const connectionToUse = connection ?? this.getConnection();
     if (!connectionToUse.ws) {
       const errorMsg = "Websocket Client not set";
       this.logger.error(errorMsg);
-      if (promiseBased)
-        return Promise.reject(new Error(errorMsg));
-      else
-        throw new Error(errorMsg);
+      if (promiseBased) return Promise.reject(new Error(errorMsg));
+      else throw new Error(errorMsg);
     }
     connectionToUse.ws.send(payload);
     if (promiseBased) {
       return new Promise((resolve, reject) => {
-        if (!id)
-          return reject(new Error("id is required for promise-based sending."));
+        if (!id) return reject(new Error("id is required for promise-based sending."));
         connectionToUse.pendingRequests.set(id, { resolve, reject });
         this.scheduleTimer(
           connectionToUse.ws,
@@ -1060,8 +1043,6 @@ var _WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     }
   }
 };
-_WebsocketCommon.MAX_CONNECTION_DURATION = 23 * 60 * 60 * 1e3;
-var WebsocketCommon = _WebsocketCommon;
 var WebsocketAPIBase = class extends WebsocketCommon {
   constructor(configuration, connectionPool = []) {
     super(configuration, connectionPool);
@@ -1101,8 +1082,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
           request?.reject(message.error);
         } else {
           const response = { data: message.result };
-          if (message?.rateLimits)
-            response.rateLimits = message.rateLimits;
+          if (message?.rateLimits) response.rateLimits = message.rateLimits;
           request?.resolve(response);
         }
       } else {
@@ -1124,8 +1104,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
       return Promise.resolve();
     }
     return new Promise((resolve, reject) => {
-      if (this.isConnecting)
-        return;
+      if (this.isConnecting) return;
       this.isConnecting = true;
       const timeout = setTimeout(() => {
         this.isConnecting = false;
@@ -1221,15 +1200,13 @@ var WebsocketStreamsBase2 = class extends WebsocketCommon {
   handleStreamAssignment(streams) {
     const connectionStreamMap = /* @__PURE__ */ new Map();
     streams.forEach((stream) => {
-      if (!this.streamCallbackMap.has(stream))
-        this.streamCallbackMap.set(stream, /* @__PURE__ */ new Set());
+      if (!this.streamCallbackMap.has(stream)) this.streamCallbackMap.set(stream, /* @__PURE__ */ new Set());
       let connection = this.streamConnectionMap.get(stream);
       if (!connection || connection.closeInitiated || connection.reconnectionPending) {
         connection = this.getConnection(true);
         this.streamConnectionMap.set(stream, connection);
       }
-      if (!connectionStreamMap.has(connection))
-        connectionStreamMap.set(connection, []);
+      if (!connectionStreamMap.has(connection)) connectionStreamMap.set(connection, []);
       connectionStreamMap.get(connection)?.push(stream);
     });
     return connectionStreamMap;