@binance/common 1.2.2 → 1.2.3

package/dist/index.mjs

@@ -777,10 +777,24 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    * @returns Timer handle
    */
   scheduleTimer(connection, callback, delay2, type = "timeout") {
-    const timer = type === "timeout" ? setTimeout(callback, delay2) : setInterval(callback, delay2);
-    if (!this.connectionTimers.has(connection))
-      this.connectionTimers.set(connection, /* @__PURE__ */ new Set());
-    this.connectionTimers.get(connection)?.add({ timer, type });
+    let timers = this.connectionTimers.get(connection);
+    if (!timers) {
+      timers = /* @__PURE__ */ new Set();
+      this.connectionTimers.set(connection, timers);
+    }
+    const timerRecord = { type };
+    const wrappedTimeout = () => {
+      try {
+        callback();
+      } finally {
+        timers.delete(timerRecord);
+      }
+    };
+    let timer;
+    if (type === "timeout") timer = setTimeout(wrappedTimeout, delay2);
+    else timer = setInterval(callback, delay2);
+    timerRecord.timer = timer;
+    timers.add(timerRecord);
     return timer;
   }
   /**
@@ -1042,13 +1056,13 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
       this.onMessage(data.toString(), targetConnection);
     });
     ws.on("ping", () => {
-      this.logger.info("Received PING from server");
+      this.logger.debug("Received PING from server");
       this.emit("ping");
       ws.pong();
-      this.logger.info("Responded PONG to server's PING message");
+      this.logger.debug("Responded PONG to server's PING message");
     });
     ws.on("pong", () => {
-      this.logger.info("Received PONG from server");
+      this.logger.debug("Received PONG from server");
       this.emit("pong");
     });
     ws.on("error", (err) => {
@@ -1128,7 +1142,7 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
       this.logger.warn("Ping only can be sent when connection is ready.");
       return;
     }
-    this.logger.info("Sending PING to all connected Websocket servers.");
+    this.logger.debug("Sending PING to all connected Websocket servers.");
     connectedConnections.forEach((connection) => {
       if (connection.ws) {
         connection.ws.ping();
@@ -1150,7 +1164,7 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    */
   send(payload, id, promiseBased = true, timeout = 5e3, connection) {
     if (!this.isConnected(connection)) {
-      const errorMsg = "Send can only be sent when connection is ready.";
+      const errorMsg = "Unable to send message \u2014 connection is not available.";
       this.logger.warn(errorMsg);
       if (promiseBased) return Promise.reject(new Error(errorMsg));
       else throw new Error(errorMsg);
@@ -1166,17 +1180,22 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
     if (promiseBased) {
       return new Promise((resolve, reject) => {
         if (!id) return reject(new Error("id is required for promise-based sending."));
-        connectionToUse.pendingRequests.set(id, { resolve, reject });
-        this.scheduleTimer(
-          connectionToUse.ws,
-          () => {
-            if (connectionToUse.pendingRequests.has(id)) {
-              connectionToUse.pendingRequests.delete(id);
-              reject(new Error(`Request timeout for id: ${id}`));
-            }
+        const timeoutHandle = setTimeout(() => {
+          if (connectionToUse.pendingRequests.has(id)) {
+            connectionToUse.pendingRequests.delete(id);
+            reject(new Error(`Request timeout for id: ${id}`));
+          }
+        }, timeout);
+        connectionToUse.pendingRequests.set(id, {
+          resolve: (v) => {
+            clearTimeout(timeoutHandle);
+            resolve(v);
           },
-          timeout
-        );
+          reject: (e) => {
+            clearTimeout(timeoutHandle);
+            reject(e);
+          }
+        });
       });
     }
   }
@@ -1256,13 +1275,13 @@ var WebsocketAPIBase = class extends WebsocketCommon {
         reject(new Error("Websocket connection timed out"));
       }, 1e4);
       this.connectPool(this.prepareURL(this.configuration.wsURL)).then(() => {
-        clearTimeout(timeout);
         this.isConnecting = false;
         resolve();
       }).catch((error) => {
-        clearTimeout(timeout);
         this.isConnecting = false;
         reject(error);
+      }).finally(() => {
+        clearTimeout(timeout);
       });
     });
   }
@@ -1433,13 +1452,7 @@ var WebsocketStreamsBase = class extends WebsocketCommon {
       const timeout = setTimeout(() => {
         reject(new Error("Websocket connection timed out"));
       }, 1e4);
-      this.connectPool(this.prepareURL(streams)).then(() => {
-        clearTimeout(timeout);
-        resolve();
-      }).catch((error) => {
-        clearTimeout(timeout);
-        reject(error);
-      });
+      this.connectPool(this.prepareURL(streams)).then(() => resolve()).catch((error) => reject(error)).finally(() => clearTimeout(timeout));
     });
   }
   /**