@binance/common 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -569,25 +569,6 @@ function replaceWebsocketStreamsPlaceholders(str, variables) {
     return "";
   });
 }
-function createStreamHandler(websocketBase, stream, id) {
-  websocketBase.subscribe(stream, id);
-  let registeredCallback;
-  return {
-    on: (event, callback) => {
-      if (event === "message") {
-        registeredCallback = (data) => callback(data);
-        const callbackSet = websocketBase.streamCallbackMap.get(stream) ?? /* @__PURE__ */ new Set();
-        callbackSet.add(registeredCallback);
-        websocketBase.streamCallbackMap.set(stream, callbackSet);
-      }
-    },
-    unsubscribe: () => {
-      if (registeredCallback)
-        websocketBase.streamCallbackMap.get(stream)?.delete(registeredCallback);
-      websocketBase.unsubscribe(stream, id);
-    }
-  };
-}
 
 // src/websocket.ts
 import { EventEmitter } from "events";
@@ -1047,6 +1028,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
   constructor(configuration, connectionPool = []) {
     super(configuration, connectionPool);
     this.isConnecting = false;
+    this.streamCallbackMap = /* @__PURE__ */ new Map();
     this.logger = Logger.getInstance();
     this.configuration = configuration;
   }
@@ -1081,10 +1063,16 @@ var WebsocketAPIBase = class extends WebsocketCommon {
         if (status && status >= 400) {
           request?.reject(message.error);
         } else {
-          const response = { data: message.result };
-          if (message?.rateLimits) response.rateLimits = message.rateLimits;
+          const response = {
+            data: message.result ?? message.response,
+            ...message.rateLimits && { rateLimits: message.rateLimits }
+          };
           request?.resolve(response);
         }
+      } else if ("event" in message && "e" in message["event"] && this.streamCallbackMap.size > 0) {
+        this.streamCallbackMap.forEach(
+          (callbacks) => callbacks.forEach((callback) => callback(message["event"]))
+        );
       } else {
         this.logger.warn("Received response for unknown or timed-out request:", message);
       }
@@ -1154,7 +1142,7 @@ var WebsocketAPIBase = class extends WebsocketCommon {
     return this.send(JSON.stringify(data), id, true, this.configuration?.timeout);
   }
 };
-var WebsocketStreamsBase2 = class extends WebsocketCommon {
+var WebsocketStreamsBase = class extends WebsocketCommon {
   constructor(configuration, connectionPool = []) {
     super(configuration, connectionPool);
     this.streamConnectionMap = /* @__PURE__ */ new Map();
@@ -1360,6 +1348,26 @@ var WebsocketStreamsBase2 = class extends WebsocketCommon {
     return this.streamConnectionMap.has(stream);
   }
 };
+function createStreamHandler(websocketBase, streamOrId, id) {
+  if (websocketBase instanceof WebsocketStreamsBase) websocketBase.subscribe(streamOrId, id);
+  let registeredCallback;
+  return {
+    on: (event, callback) => {
+      if (event === "message") {
+        registeredCallback = (data) => callback(data);
+        const callbackSet = websocketBase.streamCallbackMap.get(streamOrId) ?? /* @__PURE__ */ new Set();
+        callbackSet.add(registeredCallback);
+        websocketBase.streamCallbackMap.set(streamOrId, callbackSet);
+      }
+    },
+    unsubscribe: () => {
+      if (registeredCallback)
+        websocketBase.streamCallbackMap.get(streamOrId)?.delete(registeredCallback);
+      if (websocketBase instanceof WebsocketStreamsBase)
+        websocketBase.unsubscribe(streamOrId, id);
+    }
+  };
+}
 export {
   ALGO_REST_API_PROD_URL,
   AUTO_INVEST_REST_API_PROD_URL,
@@ -1425,7 +1433,7 @@ export {
   WebsocketAPIBase,
   WebsocketCommon,
   WebsocketEventEmitter,
-  WebsocketStreamsBase2 as WebsocketStreamsBase,
+  WebsocketStreamsBase,
   assertParamExists,
   buildQueryString,
   createStreamHandler,