@nktkas/hyperliquid 0.17.4 → 0.18.1

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

@@ -1,4 +1,5 @@
 // deno-lint-ignore-file no-explicit-any
+import { delay } from "../../../deps/jsr.io/@std/async/1.0.12/delay.js";
 import { TransportError } from "../../base.js";
 /** Simple FIFO (First In, First Out) buffer implementation. */
 class FIFOMessageBuffer {
@@ -44,192 +45,174 @@ export class ReconnectingWebSocketError extends TransportError {
  * Fully compatible with standard WebSocket API.
  */
 export class ReconnectingWebSocket {
-    /**
-     * Creates a new reconnecting WebSocket.
-     * @param url - The WebSocket URL to connect to.
-     * @param protocols - The WebSocket protocols to use.
-     * @param options - The configuration options.
-     */
     constructor(url, protocols, options) {
-        /** Controller for handling connection termination. */
-        Object.defineProperty(this, "_terminationController", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new AbortController()
-        });
-        /** WebSocket protocols defined in constructor. */
-        Object.defineProperty(this, "_protocols", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** Non-permanent original instance of WebSocket. */
         Object.defineProperty(this, "_socket", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        /** Current number of reconnection attempts */
-        Object.defineProperty(this, "_reconnectCount", {
+        Object.defineProperty(this, "_protocols", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 0
+            value: void 0
         });
-        /** The array of registered event listeners to recover from reconnection. */
-        Object.defineProperty(this, "_eventListeners", {
+        Object.defineProperty(this, "_listeners", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: []
         });
-        /** WebSocket event handlers for reconnection. */
-        Object.defineProperty(this, "_onclose", {
+        Object.defineProperty(this, "_attempt", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: 0
         });
-        /** WebSocket event handlers for reconnection. */
-        Object.defineProperty(this, "_onerror", {
+        Object.defineProperty(this, "reconnectOptions", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        /** WebSocket event handlers for reconnection. */
-        Object.defineProperty(this, "_onmessage", {
+        Object.defineProperty(this, "reconnectAbortController", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: new AbortController()
         });
-        /** WebSocket event handlers for reconnection. */
-        Object.defineProperty(this, "_onopen", {
+        Object.defineProperty(this, "_open", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: () => {
+                // Reset the attempt counter
+                this._attempt = 0;
+                // Send all buffered messages
+                let message;
+                while ((message = this.reconnectOptions.messageBuffer.shift()) !== undefined) {
+                    this._socket.send(message);
+                }
+            }
         });
-        /** Configuration options for WebSocket reconnection. */
-        Object.defineProperty(this, "reconnectOptions", {
+        Object.defineProperty(this, "_close", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: async (event) => {
+                try {
+                    // If the event was triggered but the socket is not closing, ignore it
+                    if (this._socket.readyState !== ReconnectingWebSocket.CLOSING &&
+                        this._socket.readyState !== ReconnectingWebSocket.CLOSED)
+                        return;
+                    // If the instance is terminated, do not attempt to reconnect
+                    if (this.reconnectAbortController.signal.aborted)
+                        return;
+                    // Check if reconnection should be attempted
+                    if (++this._attempt > this.reconnectOptions.maxRetries) {
+                        this._cleanup("RECONNECTION_LIMIT_REACHED");
+                        return;
+                    }
+                    const userDecision = await this.reconnectOptions.shouldReconnect(event, this.reconnectAbortController.signal);
+                    if (this.reconnectAbortController.signal.aborted)
+                        return;
+                    if (!userDecision) {
+                        this._cleanup("RECONNECTION_STOPPED_BY_USER");
+                        return;
+                    }
+                    // Delay before reconnecting
+                    const reconnectDelay = typeof this.reconnectOptions.connectionDelay === "number"
+                        ? this.reconnectOptions.connectionDelay
+                        : await this.reconnectOptions.connectionDelay(this._attempt, this.reconnectAbortController.signal);
+                    if (this.reconnectAbortController.signal.aborted)
+                        return;
+                    await delay(reconnectDelay, { signal: this.reconnectAbortController.signal });
+                    // Create a new WebSocket instance
+                    const { onclose, onerror, onmessage, onopen } = this._socket;
+                    this._socket = this._createSocket(this._socket.url, this._protocols);
+                    // Reconnect all listeners
+                    this._setupEventListeners();
+                    this._listeners.forEach(({ type, listenerProxy, options }) => {
+                        this._socket.addEventListener(type, listenerProxy, options);
+                    });
+                    this._socket.onclose = onclose;
+                    this._socket.onerror = onerror;
+                    this._socket.onmessage = onmessage;
+                    this._socket.onopen = onopen;
+                }
+                catch (error) {
+                    this._cleanup("UNKNOWN_ERROR", error);
+                }
+            }
         });
-        /** The signal that is aborted when the connection is permanently closed. */
-        Object.defineProperty(this, "terminationSignal", {
+        Object.defineProperty(this, "CONNECTING", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this._terminationController.signal
+            value: 0
         });
-        Object.defineProperty(this, "CLOSED", {
+        Object.defineProperty(this, "OPEN", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: WebSocket.CLOSED
+            value: 1
         });
         Object.defineProperty(this, "CLOSING", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: WebSocket.CLOSING
+            value: 2
         });
-        Object.defineProperty(this, "CONNECTING", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: WebSocket.CONNECTING
-        });
-        Object.defineProperty(this, "OPEN", {
+        Object.defineProperty(this, "CLOSED", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: WebSocket.OPEN
+            value: 3
         });
-        // Set the default options
         this.reconnectOptions = {
             maxRetries: options?.maxRetries ?? 3,
             connectionTimeout: options?.connectionTimeout === undefined ? 10_000 : options.connectionTimeout,
-            connectionDelay: options?.connectionDelay ?? ((attempt) => Math.min(~~(1 << attempt) * 150, 10_000)),
+            connectionDelay: options?.connectionDelay ?? ((n) => Math.min(~~(1 << n) * 150, 10_000)),
             shouldReconnect: options?.shouldReconnect ?? (() => true),
             messageBuffer: options?.messageBuffer ?? new FIFOMessageBuffer(),
         };
+        this._socket = this._createSocket(url, protocols);
         this._protocols = protocols;
-        // Create the WebSocket instance
-        this._socket = createWebSocketWithTimeout(url, this._protocols, this.reconnectOptions.connectionTimeout);
-        // Initialize the reconnection event listeners
-        this._initEventListeners();
-        // 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;
+        this._setupEventListeners();
     }
-    /** Initializes the internal event listeners for the WebSocket. */
-    _initEventListeners() {
-        this._socket.addEventListener("open", () => {
-            // Send all buffered messages
-            let message;
-            while ((message = this.reconnectOptions.messageBuffer.shift()) !== undefined) {
-                this._socket.send(message);
-            }
-        }, { once: true });
-        this._socket.addEventListener("close", async (event) => {
-            try {
-                // If the termination signal is already aborted, do not attempt to reconnect
-                if (this._terminationController.signal.aborted)
-                    return;
-                // Check if reconnection should be attempted
-                if (++this._reconnectCount > this.reconnectOptions.maxRetries) {
-                    this._cleanup(new ReconnectingWebSocketError("RECONNECTION_LIMIT_REACHED"));
-                    return;
-                }
-                const userDecision = await this.reconnectOptions.shouldReconnect(event);
-                if (this._terminationController.signal.aborted)
-                    return; // Check again after the await
-                if (!userDecision) {
-                    this._cleanup(new ReconnectingWebSocketError("RECONNECTION_STOPPED_BY_USER"));
-                    return;
-                }
-                // Delay before reconnecting
-                const delay = typeof this.reconnectOptions.connectionDelay === "number"
-                    ? this.reconnectOptions.connectionDelay
-                    : await this.reconnectOptions.connectionDelay(this._reconnectCount);
-                if (this._terminationController.signal.aborted)
-                    return; // Check again after the await
-                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));
-            }
-        }, { once: true });
+    _createSocket(url, protocols) {
+        const socket = new WebSocket(url, protocols);
+        if (this.reconnectOptions.connectionTimeout === null)
+            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
+        }, this.reconnectOptions.connectionTimeout);
+        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;
     }
-    /**
-     * Clean up internal resources.
-     * @param reason - The reason for cleanup.
-     */
-    _cleanup(reason) {
-        this._terminationController.abort(reason);
+    /** Initializes the internal event listeners for the socket. */
+    _setupEventListeners() {
+        this._socket.addEventListener("open", this._open, { once: true });
+        this._socket.addEventListener("close", this._close, { once: true });
+    }
+    /** Clean up internal resources. */
+    _cleanup(code, error) {
+        this.reconnectAbortController.abort(new ReconnectingWebSocketError(code, error));
         this.reconnectOptions.messageBuffer.clear();
-        this._eventListeners = [];
-        this._socket.dispatchEvent(new CustomEvent("error", { detail: reason }));
+        this._listeners = [];
+        this._socket.close();
     }
     // WebSocket property implementations
     get url() {
@@ -258,43 +241,38 @@ export class ReconnectingWebSocket {
     }
     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`.
      */
     close(code, reason, permanently = true) {
         this._socket.close(code, reason);
-        if (permanently) {
-            this._cleanup(new ReconnectingWebSocketError("USER_INITIATED_CLOSE"));
-        }
+        if (permanently)
+            this._cleanup("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._terminationController.signal.aborted) {
+        if (this._socket.readyState !== ReconnectingWebSocket.OPEN && !this.reconnectAbortController.signal.aborted) {
             this.reconnectOptions.messageBuffer.push(data);
         }
         else {
@@ -304,16 +282,16 @@ export class ReconnectingWebSocket {
     addEventListener(type, listener, options) {
         // Wrap the listener to handle reconnection
         let listenerProxy;
-        if (this._terminationController.signal.aborted) {
-            // If the connection is permanently closed, use the original listener
+        if (this.reconnectAbortController.signal.aborted) {
+            // If the instance is terminated, 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 }));
+            const index = this._listeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
             if (index !== -1) {
                 // Use the existing listener proxy
-                listenerProxy = this._eventListeners[index].listenerProxy;
+                listenerProxy = this._listeners[index].listenerProxy;
             }
             else {
                 // Wrap the original listener to follow the once option when reconnecting
@@ -327,15 +305,16 @@ export class ReconnectingWebSocket {
                         }
                     }
                     finally {
+                        // If the listener is marked as once, remove it after the first invocation
                         if (typeof options === "object" && options.once === true) {
-                            const index = this._eventListeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
+                            const index = this._listeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
                             if (index !== -1) {
-                                this._eventListeners.splice(index, 1);
+                                this._listeners.splice(index, 1);
                             }
                         }
                     }
                 };
-                this._eventListeners.push({ type, listener, options, listenerProxy });
+                this._listeners.push({ type, listener, options, listenerProxy });
             }
         }
         // Add the wrapped (or original) listener
@@ -343,11 +322,11 @@ export class ReconnectingWebSocket {
     }
     removeEventListener(type, listener, options) {
         // Remove a wrapped listener, not an original listener
-        const index = this._eventListeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
+        const index = this._listeners.findIndex((e) => listenersMatch(e, { type, listener, options }));
         if (index !== -1) {
-            const { listenerProxy } = this._eventListeners[index];
+            const { listenerProxy } = this._listeners[index];
             this._socket.removeEventListener(type, listenerProxy, options);
-            this._eventListeners.splice(index, 1);
+            this._listeners.splice(index, 1);
         }
         else {
             // If the wrapped listener is not found, remove the original listener
@@ -358,52 +337,30 @@ export class ReconnectingWebSocket {
         return this._socket.dispatchEvent(event);
     }
 }
-Object.defineProperty(ReconnectingWebSocket, "CLOSED", {
+Object.defineProperty(ReconnectingWebSocket, "CONNECTING", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: WebSocket.CLOSED
+    value: 0
 });
-Object.defineProperty(ReconnectingWebSocket, "CLOSING", {
+Object.defineProperty(ReconnectingWebSocket, "OPEN", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: WebSocket.CLOSING
+    value: 1
 });
-Object.defineProperty(ReconnectingWebSocket, "CONNECTING", {
+Object.defineProperty(ReconnectingWebSocket, "CLOSING", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: WebSocket.CONNECTING
+    value: 2
 });
-Object.defineProperty(ReconnectingWebSocket, "OPEN", {
+Object.defineProperty(ReconnectingWebSocket, "CLOSED", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: WebSocket.OPEN
+    value: 3
 });
-/** 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
@@ -411,26 +368,3 @@ function listenersMatch(a, b) {
     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.
- * @param ms - The number of ms to sleep.
- * @param signal - An optional abort signal.
- * @returns A promise that resolves after the specified delay.
- */
-function sleep(ms, signal) {
-    if (signal?.aborted)
-        return Promise.reject(signal.reason);
-    return new Promise((resolve, reject) => {
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(signal?.reason);
-        };
-        const onTimeout = () => {
-            signal?.removeEventListener("abort", onAbort);
-            resolve();
-        };
-        const timer = setTimeout(onTimeout, ms);
-        signal?.addEventListener("abort", onAbort, { once: true });
-    });
-}

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

@@ -41,7 +41,7 @@ export interface WebSocketTransportOptions {
     reconnect?: ReconnectingWebSocketOptions;
 }
 /** WebSocket implementation of the REST and Subscription transport interfaces. */
-export declare class WebSocketTransport implements IRequestTransport, ISubscriptionTransport {
+export declare class WebSocketTransport implements IRequestTransport, ISubscriptionTransport, AsyncDisposable {
     /** The interval timer ID for keep-alive messages. */
     protected _keepAliveTimer: number | null;
     /** The WebSocket request dispatcher instance. */
@@ -109,5 +109,12 @@ export declare class WebSocketTransport implements IRequestTransport, ISubscript
      * @returns A promise that resolves when the connection is fully closed.
      */
     close(signal?: AbortSignal): Promise<void>;
+    /**
+     * Combines the provided abort signal with the timeout signal.
+     * @param signal An optional abort signal.
+     * @returns A combined abort signal or undefined.
+     */
+    protected _getCombinedTimeoutSignal(signal?: AbortSignal): AbortSignal | undefined;
+    [Symbol.asyncDispose](): Promise<void>;
 }
 //# sourceMappingURL=websocket_transport.d.ts.map

package/esm/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,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;;;;;;;;;OASG;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;IAiBzG;;;;;;;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"}
+{"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;;;;;;;;;OASG;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,EAAE,eAAe;IACjG,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;IAQzG;;;;;;;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;;;;OAIG;IACH,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;IAQ5E,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/C"}

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

@@ -107,15 +107,11 @@ export class WebSocketTransport {
      * @note Explorer requests are not supported in the Hyperliquid WebSocket API.
      */
     request(type, payload, signal) {
-        // Send the request and wait for a response
-        const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
-        const combinedSignal = signal && timeoutSignal
-            ? AbortSignal.any([signal, timeoutSignal])
-            : signal ?? timeoutSignal;
+        const combinedTimeoutSignal = this._getCombinedTimeoutSignal(signal);
         return this._wsRequester.request("post", {
             type: type === "exchange" ? "action" : type,
             payload,
-        }, combinedSignal);
+        }, combinedTimeoutSignal);
     }
     /**
      * Subscribes to a Hyperliquid event channel.
@@ -132,11 +128,8 @@ export class WebSocketTransport {
         let subscription = this._subscriptions.get(id);
         if (!subscription) {
             // Send subscription request
-            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);
+            const combinedTimeoutSignal = this._getCombinedTimeoutSignal(signal);
+            const requestPromise = this._wsRequester.request("subscribe", payload, combinedTimeoutSignal);
             // Cache subscription info
             subscription = { listeners: new Map(), requestPromise };
             this._subscriptions.set(id, subscription);
@@ -155,12 +148,9 @@ export class WebSocketTransport {
                     // Cleanup subscription
                     this._subscriptions.delete(id);
                     // If the socket is open, send unsubscription request
-                    if (this.socket.readyState === WebSocket.OPEN) {
-                        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);
+                    if (this.socket.readyState === ReconnectingWebSocket.OPEN) {
+                        const combinedTimeoutSignal = this._getCombinedTimeoutSignal(signal);
+                        await this._wsRequester.request("unsubscribe", payload, combinedTimeoutSignal);
                     }
                 }
             };
@@ -192,11 +182,11 @@ export class WebSocketTransport {
     ready(signal) {
         return new Promise((resolve, reject) => {
             const combinedSignal = signal
-                ? AbortSignal.any([this.socket.terminationSignal, signal])
-                : this.socket.terminationSignal;
+                ? AbortSignal.any([this.socket.reconnectAbortController.signal, signal])
+                : this.socket.reconnectAbortController.signal;
             if (combinedSignal.aborted)
                 return reject(combinedSignal.reason);
-            if (this.socket.readyState === WebSocket.OPEN)
+            if (this.socket.readyState === ReconnectingWebSocket.OPEN)
                 return resolve();
             const handleOpen = () => {
                 combinedSignal.removeEventListener("abort", handleAbort);
@@ -219,7 +209,7 @@ export class WebSocketTransport {
         return new Promise((resolve, reject) => {
             if (signal?.aborted)
                 return reject(signal.reason);
-            if (this.socket.readyState === WebSocket.CLOSED)
+            if (this.socket.readyState === ReconnectingWebSocket.CLOSED)
                 return resolve();
             const handleClose = () => {
                 signal?.removeEventListener("abort", handleAbort);
@@ -234,4 +224,19 @@ export class WebSocketTransport {
             this.socket.close();
         });
     }
+    /**
+     * Combines the provided abort signal with the timeout signal.
+     * @param signal An optional abort signal.
+     * @returns A combined abort signal or undefined.
+     */
+    _getCombinedTimeoutSignal(signal) {
+        const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+        const combinedSignal = signal && timeoutSignal
+            ? AbortSignal.any([signal, timeoutSignal])
+            : signal ?? timeoutSignal;
+        return combinedSignal;
+    }
+    async [Symbol.asyncDispose]() {
+        await this.close();
+    }
 }