@binance/common 1.2.0 → 1.2.1

package/dist/index.js

@@ -943,12 +943,16 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
    */
   async closeConnectionGracefully(WebsocketConnectionToClose, connection) {
     if (!WebsocketConnectionToClose || !connection) return;
-    this.logger.debug("Waiting for pending requests to complete before disconnecting.");
+    this.logger.debug(
+      `Waiting for pending requests to complete before disconnecting websocket on connection ${connection.id}.`
+    );
     const closePromise = new Promise((resolve) => {
       this.scheduleTimer(
         WebsocketConnectionToClose,
         () => {
-          this.logger.warn("Force-closing connection after 30 seconds.");
+          this.logger.warn(
+            `Force-closing websocket connection after 30 seconds on connection ${connection.id}.`
+          );
           resolve();
         },
         3e4
@@ -957,7 +961,9 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
         WebsocketConnectionToClose,
         () => {
           if (connection.pendingRequests.size === 0) {
-            this.logger.debug("All pending requests completed, closing connection.");
+            this.logger.debug(
+              `All pending requests completed, closing websocket connection on connection ${connection.id}.`
+            );
             resolve();
           }
         },
@@ -966,7 +972,7 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
       );
     });
     await closePromise;
-    this.logger.info("Closing Websocket connection.");
+    this.logger.info(`Closing Websocket connection on connection ${connection.id}.`);
     WebsocketConnectionToClose.close();
     this.cleanup(WebsocketConnectionToClose);
   }
@@ -986,7 +992,7 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
         req.payload,
         req.options
       );
-      this.logger.debug(`Session re-logon with connection id: ${connection.id}`, data);
+      this.logger.debug(`Session re-logon on connection ${connection.id}`, data);
       try {
         await this.send(
           JSON.stringify(data),
@@ -995,12 +1001,12 @@ var WebsocketCommon = class _WebsocketCommon extends WebsocketEventEmitter {
           this.configuration.timeout,
           connection
         );
+        this.logger.debug(
+          `Session re-logon on connection ${connection.id} was successful.`
+        );
         connection.isSessionLoggedOn = true;
       } catch (err) {
-        this.logger.error(
-          `Session re-logon with connection id ${connection.id} failed:`,
-          err
-        );
+        this.logger.error(`Session re-logon on connection ${connection.id} failed:`, err);
       }
     }
   }
@@ -1364,8 +1370,9 @@ var WebsocketAPIBase = class extends WebsocketCommon {
     if (!this.isConnected()) {
       throw new Error("Not connected");
     }
-    const connections = options.isSessionLogon || options.isSessionLogout ? this.getAvailableConnections() : [this.getConnection()];
-    const skipAuth = options.isSessionLogon || options.isSessionLogout ? false : this.configuration.autoSessionReLogon && connections[0].isSessionLoggedOn;
+    const isSessionReq = options.isSessionLogon || options.isSessionLogout;
+    const connections = isSessionReq ? this.getAvailableConnections() : [this.getConnection()];
+    const skipAuth = isSessionReq ? false : this.configuration.autoSessionReLogon && connections[0].isSessionLoggedOn;
     const data = buildWebsocketAPIMessage(
       this.configuration,
       method,
@@ -1385,7 +1392,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
         )
       )
     );
-    if ((options.isSessionLogon || options.isSessionLogout) && this.configuration.autoSessionReLogon) {
+    if (isSessionReq && this.configuration.autoSessionReLogon) {
       connections.forEach((connection) => {
         if (options.isSessionLogon) {
           connection.isSessionLoggedOn = true;
@@ -1396,7 +1403,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
         }
       });
     }
-    return connections.length === 1 ? responses[0] : responses;
+    return connections.length === 1 && !isSessionReq ? responses[0] : responses;
   }
 };
 var WebsocketStreamsBase = class extends WebsocketCommon {
@@ -1559,7 +1566,7 @@ var WebsocketStreamsBase = class extends WebsocketCommon {
     connectionStreamMap.forEach((streams2, connection) => {
       if (!this.isConnected(connection)) {
         this.logger.info(
-          `Connection is not ready. Queuing subscription for streams: ${streams2}`
+          `Connection ${connection.id} is not ready. Queuing subscription for streams: ${streams2}`
         );
         connection.pendingSubscriptions?.push(...streams2);
         return;