@nktkas/hyperliquid 0.15.0 → 0.15.2

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;
 });