@nktkas/hyperliquid 0.15.1 → 0.15.2

package/script/src/transports/websocket/_reconnecting_websocket.js

@@ -64,21 +64,21 @@
          * @param options - The configuration options.
          */
         constructor(url, protocols, options) {
-            /** Controller for handling connection termination */
+            /** Controller for handling connection termination. */
             Object.defineProperty(this, "_terminationController", {
                 enumerable: true,
                 configurable: true,
                 writable: true,
                 value: new AbortController()
             });
-            /** WebSocket protocols */
+            /** WebSocket protocols defined in constructor. */
             Object.defineProperty(this, "_protocols", {
                 enumerable: true,
                 configurable: true,
                 writable: true,
                 value: void 0
             });
-            /** The underlying WebSocket instance */
+            /** Non-permanent original instance of WebSocket. */
             Object.defineProperty(this, "_socket", {
                 enumerable: true,
                 configurable: true,
@@ -92,21 +92,49 @@
                 writable: true,
                 value: 0
             });
-            /** Array of registered event listeners */
+            /** The array of registered event listeners to recover from reconnection. */
             Object.defineProperty(this, "_eventListeners", {
                 enumerable: true,
                 configurable: true,
                 writable: true,
                 value: []
             });
-            /** Configuration options */
+            /** WebSocket event handlers for reconnection. */
+            Object.defineProperty(this, "_onclose", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** WebSocket event handlers for reconnection. */
+            Object.defineProperty(this, "_onerror", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** WebSocket event handlers for reconnection. */
+            Object.defineProperty(this, "_onmessage", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** WebSocket event handlers for reconnection. */
+            Object.defineProperty(this, "_onopen", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** Configuration options for WebSocket reconnection. */
             Object.defineProperty(this, "reconnectOptions", {
                 enumerable: true,
                 configurable: true,
                 writable: true,
                 value: void 0
             });
-            /** An AbortSignal that is triggered when the connection is permanently closed */
+            /** The signal that is aborted when the connection is permanently closed. */
             Object.defineProperty(this, "terminationSignal", {
                 enumerable: true,
                 configurable: true,
@@ -137,6 +165,7 @@
                 writable: true,
                 value: WebSocket.OPEN
             });
+            // Set the default options
             this.reconnectOptions = {
                 maxRetries: options?.maxRetries ?? 3,
                 connectionTimeout: options?.connectionTimeout === undefined ? 10_000 : options.connectionTimeout,
@@ -145,42 +174,19 @@
                 messageBuffer: options?.messageBuffer ?? new FIFOMessageBuffer(),
             };
             this._protocols = protocols;
-            this._socket = this.reconnectOptions.connectionTimeout
-                ? this._connectWithTimeout(url, this._protocols, this.reconnectOptions.connectionTimeout)
-                : new WebSocket(url, this._protocols);
+            // Create the WebSocket instance
+            this._socket = createWebSocketWithTimeout(url, this._protocols, this.reconnectOptions.connectionTimeout);
+            // Initialize the reconnection event listeners
             this._initEventListeners();
-        }
-        /**
-         * Creates a WebSocket connection with timeout.
-         * @param url - The WebSocket URL to connect to.
-         * @param protocols - The WebSocket protocols to use.
-         * @param timeout - The connection timeout in ms.
-         * @returns A new WebSocket instance.
-         */
-        _connectWithTimeout(url, protocols, timeout) {
-            const socket = new WebSocket(url, protocols);
-            const timeoutId = setTimeout(() => {
-                socket.removeEventListener("open", openHandler);
-                socket.removeEventListener("close", closeHandler);
-                socket.close(3008, "Timeout"); // https://www.iana.org/assignments/websocket/websocket.xml#close-code-number
-            }, timeout);
-            const openHandler = () => {
-                socket.removeEventListener("close", closeHandler);
-                clearTimeout(timeoutId);
-            };
-            const closeHandler = () => {
-                socket.removeEventListener("open", openHandler);
-                clearTimeout(timeoutId);
-            };
-            socket.addEventListener("open", openHandler, { once: true });
-            socket.addEventListener("close", closeHandler, { once: true });
-            return socket;
+            // Store the original event listeners for reconnection
+            this._onclose = this._socket.onclose;
+            this._onerror = this._socket.onerror;
+            this._onmessage = this._socket.onmessage;
+            this._onopen = this._socket.onopen;
         }
         /** Initializes the internal event listeners for the WebSocket. */
         _initEventListeners() {
             this._socket.addEventListener("open", () => {
-                // Reset reconnection count
-                this._reconnectCount = 0;
                 // Send all buffered messages
                 let message;
                 while ((message = this.reconnectOptions.messageBuffer.shift()) !== undefined) {
@@ -190,7 +196,7 @@
             this._socket.addEventListener("close", async (event) => {
                 try {
                     // If the termination signal is already aborted, do not attempt to reconnect
-                    if (this.terminationSignal.aborted)
+                    if (this._terminationController.signal.aborted)
                         return;
                     // Check if reconnection should be attempted
                     if (++this._reconnectCount > this.reconnectOptions.maxRetries) {
@@ -198,7 +204,7 @@
                         return;
                     }
                     const userDecision = await this.reconnectOptions.shouldReconnect(event);
-                    if (this.terminationSignal.aborted)
+                    if (this._terminationController.signal.aborted)
                         return; // Check again after the await
                     if (!userDecision) {
                         this._cleanup(new ReconnectingWebSocketError("RECONNECTION_STOPPED_BY_USER"));
@@ -208,18 +214,20 @@
                     const delay = typeof this.reconnectOptions.connectionDelay === "number"
                         ? this.reconnectOptions.connectionDelay
                         : await this.reconnectOptions.connectionDelay(this._reconnectCount);
-                    if (this.terminationSignal.aborted)
+                    if (this._terminationController.signal.aborted)
                         return; // Check again after the await
-                    await sleep(delay, this.terminationSignal);
-                    // Reconnect the socket
-                    this._socket = this.reconnectOptions.connectionTimeout
-                        ? this._connectWithTimeout(this.url, this._protocols, this.reconnectOptions.connectionTimeout)
-                        : new WebSocket(this.url, this._protocols);
+                    await sleep(delay, this._terminationController.signal);
+                    // Create a new WebSocket instance
+                    this._socket = createWebSocketWithTimeout(this.url, this._protocols, this.reconnectOptions.connectionTimeout);
                     // Reconnect all listeners
                     this._initEventListeners();
                     this._eventListeners.forEach(({ type, listenerProxy, options }) => {
                         this._socket.addEventListener(type, listenerProxy, options);
                     });
+                    this._socket.onclose = this._onclose;
+                    this._socket.onerror = this._onerror;
+                    this._socket.onmessage = this._onmessage;
+                    this._socket.onopen = this._onopen;
                 }
                 catch (error) {
                     this._cleanup(new ReconnectingWebSocketError("UNKNOWN_ERROR", error));
@@ -234,17 +242,7 @@
             this._terminationController.abort(reason);
             this.reconnectOptions.messageBuffer.clear();
             this._eventListeners = [];
-        }
-        /**
-         * Check if two event listeners are the same (just like EventTarget).
-         * @param a - First event listener configuration.
-         * @param b - Second event listener configuration.
-         * @returns True if the listeners match.
-         */
-        _isListenerMatch(a, b) {
-            const aCapture = Boolean(typeof a.options === "object" ? a.options.capture : a.options);
-            const bCapture = Boolean(typeof b.options === "object" ? b.options.capture : b.options);
-            return a.type === b.type && a.listener === b.listener && aCapture === bCapture;
+            this._socket.dispatchEvent(new CustomEvent("error", { detail: reason }));
         }
         // WebSocket property implementations
         get url() {
@@ -273,38 +271,43 @@
         }
         set onclose(value) {
             this._socket.onclose = value;
+            this._onclose = value; // Store the listener for reconnection
         }
         get onerror() {
             return this._socket.onerror;
         }
         set onerror(value) {
             this._socket.onerror = value;
+            this._onerror = value; // Store the listener for reconnection
         }
         get onmessage() {
             return this._socket.onmessage;
         }
         set onmessage(value) {
             this._socket.onmessage = value;
+            this._onmessage = value; // Store the listener for reconnection
         }
         get onopen() {
             return this._socket.onopen;
         }
         set onopen(value) {
             this._socket.onopen = value;
+            this._onopen = value; // Store the listener for reconnection
         }
         /**
-         * @param permanently - If true, the connection will be permanently closed. Default is true.
+         * @param permanently - If `true`, the connection will be permanently closed. Default is `true`.
          */
         close(code, reason, permanently = true) {
-            if (permanently)
-                this._cleanup(new ReconnectingWebSocketError("USER_INITIATED_CLOSE"));
             this._socket.close(code, reason);
+            if (permanently) {
+                this._cleanup(new ReconnectingWebSocketError("USER_INITIATED_CLOSE"));
+            }
         }
         /**
          * @note If the connection is not open, the data will be buffered and sent when the connection is established.
          */
         send(data) {
-            if (this._socket.readyState !== WebSocket.OPEN && !this.terminationSignal.aborted) {
+            if (this._socket.readyState !== WebSocket.OPEN && !this._terminationController.signal.aborted) {
                 this.reconnectOptions.messageBuffer.push(data);
             }
             else {
@@ -312,38 +315,57 @@
             }
         }
         addEventListener(type, listener, options) {
-            // Check if the listener is already added
-            const exists = this._eventListeners.some((e) => this._isListenerMatch(e, { type, listener, options }));
-            if (exists)
-                return;
-            // Wrap the original listener to follow the once option when reconnecting
-            const listenerProxy = (event) => {
-                try {
-                    if (typeof listener === "function") {
-                        listener.call(this, event);
-                    }
-                    else {
-                        listener.handleEvent(event);
-                    }
+            // Wrap the listener to handle reconnection
+            let listenerProxy;
+            if (this._terminationController.signal.aborted) {
+                // If the connection is permanently closed, use the original listener
+                listenerProxy = listener;
+            }
+            else {
+                // Check if the listener is already registered
+                const index = this._eventListeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
+                if (index !== -1) {
+                    // Use the existing listener proxy
+                    listenerProxy = this._eventListeners[index].listenerProxy;
                 }
-                finally {
-                    if (typeof options === "object" && options.once === true) {
-                        const index = this._eventListeners.findIndex((e) => this._isListenerMatch(e, { type, listener, options }));
-                        if (index !== -1)
-                            this._eventListeners.splice(index, 1);
-                    }
+                else {
+                    // Wrap the original listener to follow the once option when reconnecting
+                    listenerProxy = (event) => {
+                        try {
+                            if (typeof listener === "function") {
+                                listener.call(this, event);
+                            }
+                            else {
+                                listener.handleEvent(event);
+                            }
+                        }
+                        finally {
+                            if (typeof options === "object" && options.once === true) {
+                                const index = this._eventListeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
+                                if (index !== -1) {
+                                    this._eventListeners.splice(index, 1);
+                                }
+                            }
+                        }
+                    };
+                    this._eventListeners.push({ type, listener, options, listenerProxy });
                 }
-            };
-            this._eventListeners.push({ type, listener, options, listenerProxy });
+            }
+            // Add the wrapped (or original) listener
             this._socket.addEventListener(type, listenerProxy, options);
         }
         removeEventListener(type, listener, options) {
-            const index = this._eventListeners.findIndex((e) => this._isListenerMatch(e, { type, listener, options }));
+            // Remove a wrapped listener, not an original listener
+            const index = this._eventListeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
             if (index !== -1) {
                 const { listenerProxy } = this._eventListeners[index];
                 this._socket.removeEventListener(type, listenerProxy, options);
                 this._eventListeners.splice(index, 1);
             }
+            else {
+                // If the wrapped listener is not found, remove the original listener
+                this._socket.removeEventListener(type, listener, options);
+            }
         }
         dispatchEvent(event) {
             return this._socket.dispatchEvent(event);
@@ -374,6 +396,35 @@
         writable: true,
         value: WebSocket.OPEN
     });
+    /** Creates a WebSocket with connection timeout. */
+    function createWebSocketWithTimeout(url, protocols, timeout) {
+        const socket = new WebSocket(url, protocols);
+        if (timeout === null || timeout === undefined)
+            return socket;
+        const timeoutId = setTimeout(() => {
+            socket.removeEventListener("open", openHandler);
+            socket.removeEventListener("close", closeHandler);
+            socket.close(3008, "Timeout"); // https://www.iana.org/assignments/websocket/websocket.xml#close-code-number
+        }, timeout);
+        const openHandler = () => {
+            socket.removeEventListener("close", closeHandler);
+            clearTimeout(timeoutId);
+        };
+        const closeHandler = () => {
+            socket.removeEventListener("open", openHandler);
+            clearTimeout(timeoutId);
+        };
+        socket.addEventListener("open", openHandler, { once: true });
+        socket.addEventListener("close", closeHandler, { once: true });
+        return socket;
+    }
+    /** Check if two event listeners are the same (just like EventTarget). */
+    function listenersMatch(a, b) {
+        // EventTarget only compares capture in options, even if one is an object and the other is boolean
+        const aCapture = Boolean(typeof a.options === "object" ? a.options.capture : a.options);
+        const bCapture = Boolean(typeof b.options === "object" ? b.options.capture : b.options);
+        return a.type === b.type && a.listener === b.listener && aCapture === bCapture;
+    }
     /**
      * Returns a promise that resolves after the specified number of ms,
      * or rejects as soon as the given signal is aborted.

package/script/src/transports/websocket/_websocket_request_dispatcher.d.ts

@@ -13,22 +13,17 @@ export declare class WebSocketRequestError extends TransportError {
  * Handles request creation, sending, and mapping responses to their corresponding requests.
  */
 export declare class WebSocketRequestDispatcher {
-    protected socket: WebSocket;
-    /** Last used request ID */
-    protected lastId: number;
+    private socket;
+    /** Last used post request ID */
+    private lastId;
     /** Map of pending requests waiting for responses */
-    protected pending: Map<number | string, {
-        resolve: (value: unknown) => void;
-        reject: (reason: unknown) => void;
-    }>;
+    private pending;
     /**
      * Creates a new WebSocket request dispatcher.
      * @param socket - WebSocket connection instance for sending requests to the Hyperliquid WebSocket API
      * @param hlEvents - Used to recognize Hyperliquid responses and match them with sent requests
      */
     constructor(socket: WebSocket, hlEvents: HyperliquidEventTarget);
-    /** Gets the next request ID */
-    protected get nextId(): number;
     /**
      * Sends a request to the Hyperliquid API.
      * @param method - The method of websocket request.
@@ -42,13 +37,13 @@ export declare class WebSocketRequestDispatcher {
      * @param id - A request ID or a stringified request.
      * @param value - A resolution value.
      */
-    protected resolve(id: number | string, value: unknown): void;
+    private resolve;
     /**
      * Rejects a pending request.
      * @param id - A request ID or a stringified request.
      * @param reason - A rejection reason.
      */
-    protected reject(id: number | string, reason: unknown): void;
+    private reject;
     /**
      * Normalizes a request object to an ID.
      * @param value - A request object.

package/script/src/transports/websocket/_websocket_request_dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_websocket_request_dispatcher.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/_websocket_request_dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAc;gBACzC,OAAO,EAAE,MAAM;CAI9B;AAED;;;GAGG;AACH,qBAAa,0BAA0B;IAevB,SAAS,CAAC,MAAM,EAAE,SAAS;IAdvC,2BAA2B;IAC3B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAK;IAE7B,oDAAoD;IACpD,SAAS,CAAC,OAAO,EAAE,GAAG,CAClB,MAAM,GAAG,MAAM,EACf;QAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE,CAC3E,CAAa;IAEd;;;;OAIG;gBACmB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB;IA2DzE,+BAA+B;IAC/B,SAAS,KAAK,MAAM,IAAI,MAAM,CAE7B;IAED;;;;;;OAMG;IACG,OAAO,CACT,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,aAAa,EAC5C,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,OAAO,CAAC;IAkCnB;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAK5D;;;;OAIG;IACH,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAK5D;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAK7C"}
+{"version":3,"file":"_websocket_request_dispatcher.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/_websocket_request_dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAY7E;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAc;gBACzC,OAAO,EAAE,MAAM;CAI9B;AAED;;;GAGG;AACH,qBAAa,0BAA0B;IAkBvB,OAAO,CAAC,MAAM;IAjB1B,gCAAgC;IAChC,OAAO,CAAC,MAAM,CAAa;IAE3B,oDAAoD;IACpD,OAAO,CAAC,OAAO,CAMD;IAEd;;;;OAIG;gBACiB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB;IA2DvE;;;;;;OAMG;IACG,OAAO,CACT,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,aAAa,EAC5C,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,OAAO,CAAC;IAiCnB;;;;OAIG;IACH,OAAO,CAAC,OAAO;IAKf;;;;OAIG;IACH,OAAO,CAAC,MAAM;IAKd;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAK7C"}

package/script/src/transports/websocket/_websocket_request_dispatcher.js

@@ -40,7 +40,7 @@
                 writable: true,
                 value: socket
             });
-            /** Last used request ID */
+            /** Last used post request ID */
             Object.defineProperty(this, "lastId", {
                 enumerable: true,
                 configurable: true,
@@ -102,10 +102,6 @@
                 this.pending.clear();
             });
         }
-        /** Gets the next request ID */
-        get nextId() {
-            return ++this.lastId;
-        }
         /**
          * Sends a request to the Hyperliquid API.
          * @param method - The method of websocket request.
@@ -114,12 +110,14 @@
          * @returns A promise that resolves with the parsed JSON response body.
          */
         async request(method, payload, signal) {
-            signal?.throwIfAborted();
+            // Reject the request if the signal is aborted
+            if (signal?.aborted)
+                return Promise.reject(signal.reason);
             // Create a request object
             let id;
             let request;
             if (method === "post") {
-                id = this.nextId;
+                id = ++this.lastId;
                 request = { method, id, request: payload };
             }
             else {
@@ -180,18 +178,16 @@
         if (Array.isArray(obj)) {
             return obj.map(deepLowerHex);
         }
-        else if (obj && typeof obj === "object") {
+        if (typeof obj === "object" && obj !== null) {
             return Object.entries(obj).reduce((acc, [key, val]) => ({
                 ...acc,
                 [key]: deepLowerHex(val),
             }), {});
         }
-        else if (typeof obj === "string" && /^0x[0-9A-Fa-f]+$/.test(obj)) {
+        if (typeof obj === "string" && /^0x[0-9A-Fa-f]+$/.test(obj)) {
             return obj.toLowerCase();
         }
-        else {
-            return obj;
-        }
+        return obj;
     }
     /**
      * Deeply sort the keys of an object.

package/script/src/transports/websocket/websocket_transport.d.ts

@@ -1,9 +1,9 @@
-import { ReconnectingWebSocket, type ReconnectingWebSocketOptions } from "./_reconnecting_websocket.js";
+import { type MessageBufferStrategy, ReconnectingWebSocket, ReconnectingWebSocketError, type ReconnectingWebSocketOptions } from "./_reconnecting_websocket.js";
 import { HyperliquidEventTarget } from "./_hyperliquid_event_target.js";
 import { WebSocketRequestDispatcher, WebSocketRequestError } from "./_websocket_request_dispatcher.js";
 import type { IRequestTransport, ISubscriptionTransport, Subscription } from "../../base.js";
 export { WebSocketRequestError };
-export type { MessageBufferStrategy, ReconnectingWebSocketOptions } from "./_reconnecting_websocket.js";
+export { type MessageBufferStrategy, ReconnectingWebSocketError, type ReconnectingWebSocketOptions };
 /** Configuration options for the WebSocket transport layer. */
 export interface WebSocketTransportOptions {
     /**
@@ -105,7 +105,5 @@ export declare class WebSocketTransport implements IRequestTransport, ISubscript
      * @returns A promise that resolves when the connection is fully closed.
      */
     close(signal?: AbortSignal): Promise<void>;
-    /** Combines a timeout with an optional abort signal. */
-    protected _combineTimeoutWithSignal(timeout?: number | null, signal?: AbortSignal): AbortSignal | undefined;
 }
 //# sourceMappingURL=websocket_transport.d.ts.map

package/script/src/transports/websocket/websocket_transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket_transport.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/websocket_transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,KAAK,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AACvG,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7F,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,YAAY,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAExG,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACtC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAExB;;;OAGG;IACH,SAAS,CAAC,EAAE;QACR;;;;WAIG;QACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5B,CAAC;IAEF;;OAEG;IACH,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C;AAED,kFAAkF;AAClF,qBAAa,kBAAmB,YAAW,iBAAiB,EAAE,sBAAsB;IAChF,qDAAqD;IACrD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhD,iDAAiD;IACjD,SAAS,CAAC,YAAY,EAAE,0BAA0B,CAAC;IAEnD,6CAA6C;IAC7C,SAAS,CAAC,SAAS,EAAE,sBAAsB,CAAC;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,EAAE,GAAG,CACzB,MAAM,EACN;QACI,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACrF,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KACpC,CACJ,CAAa;IAEd;;;OAGG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,yCAAyC;IACzC,QAAQ,CAAC,SAAS,EAAE;QAChB;;;WAGG;QACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACpC,CAAC;IAEF,oDAAoD;IACpD,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAEvC;;;OAGG;gBACS,OAAO,CAAC,EAAE,yBAAyB;IAuC/C;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBzG;;;;;;;OAOG;IACG,SAAS,CACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EACrC,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,YAAY,CAAC;IAgExB;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1C,wDAAwD;IACxD,SAAS,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;CAK9G"}
+{"version":3,"file":"websocket_transport.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/websocket_transport.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,qBAAqB,EAC1B,qBAAqB,EACrB,0BAA0B,EAC1B,KAAK,4BAA4B,EACpC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AACvG,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7F,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,OAAO,EAAE,KAAK,qBAAqB,EAAE,0BAA0B,EAAE,KAAK,4BAA4B,EAAE,CAAC;AAErG,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACtC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAExB;;;OAGG;IACH,SAAS,CAAC,EAAE;QACR;;;;WAIG;QACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5B,CAAC;IAEF;;OAEG;IACH,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C;AAED,kFAAkF;AAClF,qBAAa,kBAAmB,YAAW,iBAAiB,EAAE,sBAAsB;IAChF,qDAAqD;IACrD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhD,iDAAiD;IACjD,SAAS,CAAC,YAAY,EAAE,0BAA0B,CAAC;IAEnD,6CAA6C;IAC7C,SAAS,CAAC,SAAS,EAAE,sBAAsB,CAAC;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,EAAE,GAAG,CACzB,MAAM,EACN;QACI,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACrF,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KACpC,CACJ,CAAa;IAEd;;;OAGG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,yCAAyC;IACzC,QAAQ,CAAC,SAAS,EAAE;QAChB;;;WAGG;QACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACpC,CAAC;IAEF,oDAAoD;IACpD,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAEvC;;;OAGG;gBACS,OAAO,CAAC,EAAE,yBAAyB;IAuC/C;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBzG;;;;;;;OAOG;IACG,SAAS,CACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EACrC,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,YAAY,CAAC;IAwExB;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB7C"}

package/script/src/transports/websocket/websocket_transport.js

@@ -9,8 +9,9 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.WebSocketTransport = exports.WebSocketRequestError = void 0;
+    exports.WebSocketTransport = exports.ReconnectingWebSocketError = exports.WebSocketRequestError = void 0;
     const _reconnecting_websocket_js_1 = require("./_reconnecting_websocket.js");
+    Object.defineProperty(exports, "ReconnectingWebSocketError", { enumerable: true, get: function () { return _reconnecting_websocket_js_1.ReconnectingWebSocketError; } });
     const _hyperliquid_event_target_js_1 = require("./_hyperliquid_event_target.js");
     const _websocket_request_dispatcher_js_1 = require("./_websocket_request_dispatcher.js");
     Object.defineProperty(exports, "WebSocketRequestError", { enumerable: true, get: function () { return _websocket_request_dispatcher_js_1.WebSocketRequestError; } });
@@ -123,7 +124,10 @@
                 return Promise.reject(new _websocket_request_dispatcher_js_1.WebSocketRequestError("Explorer requests are not supported in the Hyperliquid WebSocket API."));
             }
             // Send the request and wait for a response
-            const combinedSignal = this._combineTimeoutWithSignal(this.timeout, signal);
+            const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+            const combinedSignal = signal && timeoutSignal
+                ? AbortSignal.any([signal, timeoutSignal])
+                : signal ?? timeoutSignal;
             return this._wsRequester.request("post", {
                 type: type === "exchange" ? "action" : type,
                 payload,
@@ -144,7 +148,10 @@
             let subscription = this._subscriptions.get(id);
             if (!subscription) {
                 // Send subscription request
-                const combinedSignal = this._combineTimeoutWithSignal(this.timeout, signal);
+                const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+                const combinedSignal = signal && timeoutSignal
+                    ? AbortSignal.any([signal, timeoutSignal])
+                    : signal ?? timeoutSignal;
                 const requestPromise = this._wsRequester.request("subscribe", payload, combinedSignal);
                 // Cache subscription info
                 subscription = { listeners: new Map(), requestPromise };
@@ -165,7 +172,10 @@
                         this._subscriptions.delete(id);
                         // If the socket is open, send unsubscription request
                         if (this.socket.readyState === WebSocket.OPEN) {
-                            const combinedSignal = this._combineTimeoutWithSignal(this.timeout, signal);
+                            const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+                            const combinedSignal = signal && timeoutSignal
+                                ? AbortSignal.any([signal, timeoutSignal])
+                                : signal ?? timeoutSignal;
                             await this._wsRequester.request("unsubscribe", payload, combinedSignal);
                         }
                     }
@@ -240,14 +250,6 @@
                 this.socket.close();
             });
         }
-        /** Combines a timeout with an optional abort signal. */
-        _combineTimeoutWithSignal(timeout, signal) {
-            if (typeof timeout !== "number")
-                return signal;
-            if (!(signal instanceof AbortSignal))
-                return AbortSignal.timeout(timeout);
-            return AbortSignal.any([AbortSignal.timeout(timeout), signal]);
-        }
     }
     exports.WebSocketTransport = WebSocketTransport;
 });