@nktkas/hyperliquid 0.13.0 → 0.13.2

package/esm/src/transports/websocket/hyperliquid_event_target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hyperliquid_event_target.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/hyperliquid_event_target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AAYtG;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,yCAAyC;IACzC,oBAAoB,EAAE,WAAW,CAAC;QAC9B,qCAAqC;QACrC,MAAM,EAAE,WAAW,GAAG,aAAa,CAAC;QACpC,oCAAoC;QACpC,YAAY,EAAE,OAAO,CAAC;KACzB,CAAC,CAAC;IAEH,qCAAqC;IACrC,IAAI,EAAE,WAAW,CAAC;QACd,gCAAgC;QAChC,EAAE,EAAE,MAAM,CAAC;QACX,sBAAsB;QACtB,QAAQ;QACJ,gDAAgD;QAC9C;YACE,uDAAuD;YACvD,IAAI,EAAE,MAAM,CAAC;YACb,oCAAoC;YACpC,OAAO,EAAE;gBACL,yCAAyC;gBACzC,IAAI,EAAE,MAAM,CAAC;gBACb,gCAAgC;gBAChC,IAAI,EAAE,OAAO,CAAC;aACjB,CAAC;SACL;QACD,wCAAwC;WACtC;YACE,gDAAgD;YAChD,IAAI,EAAE,QAAQ,CAAC;YACf,sCAAsC;YACtC,OAAO,EAAE;gBACL,kEAAkE;gBAClE,MAAM,EAAE,IAAI,GAAG,KAAK,CAAC;gBACrB,oCAAoC;gBACpC,QAAQ,EACF;oBACE,wBAAwB;oBACxB,IAAI,EAAE,MAAM,CAAC;oBACb,sCAAsC;oBACtC,IAAI,CAAC,EAAE,OAAO,CAAC;iBAClB,GACC,MAAM,CAAC;aAChB,CAAC;SACL,CAAC;KACT,CAAC,CAAC;IAEH,uCAAuC;IACvC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAE3B,0BAA0B;IAC1B,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAE7B,gCAAgC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,gBAAgB,CAAC,mBAAmB,CAAC;IAC7E;;;OAGG;gBACS,MAAM,EAAE,SAAS;CAahC"}
+{"version":3,"file":"hyperliquid_event_target.d.ts","sourceRoot":"","sources":["../../../../src/src/transports/websocket/hyperliquid_event_target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AACtG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAY1E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,0CAA0C;IAC1C,oBAAoB,EAAE,WAAW,CAAC;QAC9B,sCAAsC;QACtC,MAAM,EAAE,WAAW,GAAG,aAAa,CAAC;QACpC,qCAAqC;QACrC,YAAY,EAAE,OAAO,CAAC;KACzB,CAAC,CAAC;IAEH,sCAAsC;IACtC,IAAI,EAAE,WAAW,CAAC;QACd,iCAAiC;QACjC,EAAE,EAAE,MAAM,CAAC;QACX,uBAAuB;QACvB,QAAQ;QACJ,iDAAiD;QAC/C;YACE,wDAAwD;YACxD,IAAI,EAAE,MAAM,CAAC;YACb,qCAAqC;YACrC,OAAO,EAAE;gBACL,0CAA0C;gBAC1C,IAAI,EAAE,MAAM,CAAC;gBACb,iCAAiC;gBACjC,IAAI,EAAE,OAAO,CAAC;aACjB,CAAC;SACL;QACD,yCAAyC;WACvC;YACE,iDAAiD;YACjD,IAAI,EAAE,QAAQ,CAAC;YACf,uCAAuC;YACvC,OAAO,EAAE;gBACL,mEAAmE;gBACnE,MAAM,EAAE,IAAI,GAAG,KAAK,CAAC;gBACrB,qCAAqC;gBACrC,QAAQ,EACF;oBACE,yBAAyB;oBACzB,IAAI,EAAE,MAAM,CAAC;oBACb,uCAAuC;oBACvC,IAAI,CAAC,EAAE,OAAO,CAAC;iBAClB,GACC,MAAM,CAAC;aAChB,CAAC;SACL,CAAC;KACT,CAAC,CAAC;IAEH,wCAAwC;IACxC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAE3B,2BAA2B;IAC3B,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAE7B,mCAAmC;IACnC,cAAc,EAAE,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAE9C,yCAAyC;IACzC,YAAY,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;IAEvC,gCAAgC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,gBAAgB,CAAC,mBAAmB,CAAC;IAC7E;;;OAGG;gBACS,MAAM,EAAE,SAAS;CAiBhC"}

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

@@ -15,6 +15,12 @@ export class HyperliquidEventTarget extends TypedEventTarget {
                 if (isHyperliquidMsg(msg)) {
                     this.dispatchEvent(new CustomEvent(msg.channel, { detail: msg.data }));
                 }
+                else if (isExplorerBlockMsg(msg)) {
+                    this.dispatchEvent(new CustomEvent("_explorerBlock", { detail: msg }));
+                }
+                else if (isExplorerTxsMsg(msg)) {
+                    this.dispatchEvent(new CustomEvent("_explorerTxs", { detail: msg }));
+                }
             }
             catch {
                 // Ignore JSON parsing errors
@@ -31,3 +37,34 @@ function isHyperliquidMsg(value) {
     return typeof value === "object" && value !== null &&
         "channel" in value && typeof value.channel === "string";
 }
+/**
+ * Type guard for explorer block messages.
+ * @param value - The value to check.
+ * @returns True if the value is an array of block details.
+ */
+function isExplorerBlockMsg(value) {
+    return Array.isArray(value) && value.length > 0 &&
+        value.every((block) => typeof block === "object" && block !== null && !Array.isArray(block) &&
+            "height" in block && typeof block.height === "number" &&
+            "blockTime" in block && typeof block.blockTime === "number" &&
+            "hash" in block && typeof block.hash === "string" &&
+            "proposer" in block && typeof block.proposer === "string" &&
+            "numTxs" in block && typeof block.numTxs === "number");
+}
+/**
+ * Type guard for explorer transactions messages.
+ * @param value - The value to check.
+ * @returns True if the value is an array of transaction details.
+ */
+function isExplorerTxsMsg(value) {
+    return Array.isArray(value) && value.length > 0 &&
+        value.every((tx) => {
+            return typeof tx === "object" && tx !== null && !Array.isArray(tx) &&
+                "action" in tx && typeof tx.action === "object" && tx.action !== null &&
+                "block" in tx && typeof tx.block === "number" &&
+                "error" in tx && (typeof tx.error === "string" || tx.error === null) &&
+                "hash" in tx && typeof tx.hash === "string" &&
+                "time" in tx && typeof tx.time === "number" &&
+                "user" in tx && typeof tx.user === "string";
+        });
+}

package/esm/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,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAc;IACrD;;;OAGG;gBACS,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;IAkDzE,+BAA+B;IAC/B,SAAS,KAAK,MAAM,IAAI,MAAM,CAE7B;IAED;;;;;;OAMG;IACH,OAAO,CACH,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,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,cAAc;IACrD;;;OAGG;gBACS,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;IACH,OAAO,CACH,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"}

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

@@ -65,19 +65,19 @@ export class WebSocketRequestDispatcher {
                     const parsedRequest = JSON.parse(request);
                     if ("id" in parsedRequest && typeof parsedRequest.id === "number") {
                         // If a post request was sent, it is possible to get the id from the request
-                        this.reject(parsedRequest.id, new WebSocketRequestError(event.detail));
+                        this.reject(parsedRequest.id, new WebSocketRequestError(`Cannot complete WebSocket request: ${event.detail}`));
                     }
                     else if ("subscription" in parsedRequest &&
                         typeof parsedRequest.subscription === "object" &&
                         parsedRequest.subscription !== null) {
                         // If a subscription/unsubscribe request was sent, use the request as an id
                         const id = WebSocketRequestDispatcher.requestToId(parsedRequest.subscription);
-                        this.reject(id, new WebSocketRequestError(event.detail));
+                        this.reject(id, new WebSocketRequestError(`Cannot complete WebSocket request: ${event.detail}`));
                     }
                     else {
                         // If the request is not recognized, use the parsed request as an id
                         const id = WebSocketRequestDispatcher.requestToId(parsedRequest);
-                        this.reject(id, new WebSocketRequestError(event.detail));
+                        this.reject(id, new WebSocketRequestError(`Cannot complete WebSocket request: ${event.detail}`));
                     }
                 }
             }
@@ -88,7 +88,7 @@ export class WebSocketRequestDispatcher {
         // Throws all pending requests if the connection is dropped
         socket.addEventListener("close", () => {
             this.pending.forEach(({ reject }) => {
-                reject(new WebSocketRequestError("The WebSocket connection has been closed."));
+                reject(new WebSocketRequestError("Cannot complete WebSocket request: connection is closed"));
             });
             this.pending.clear();
         });

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

@@ -48,12 +48,15 @@ export declare class WebSocketTransport implements IRequestTransport, ISubscript
     protected _hlEvents: HyperliquidEventTarget;
     /**
      * Map of active subscriptions.
-     * - Key: Unique subscription identifier (stringified payload)
-     * - Value: Subscription info containing payload and listener mappings
+     * - Key: Unique subscription identifier based on payload
+     * - Value: Subscription info containing the subscription request promise
+     *   and a map of listeners to their metadata (channel + unsubscribe function).
      */
     protected _subscriptions: Map<string, {
-        channel: string;
-        listeners: Map<(data: CustomEvent) => void, () => Promise<void>>;
+        listeners: Map<(data: CustomEvent) => void, {
+            channel: string;
+            unsubscribe: (signal?: AbortSignal) => Promise<void>;
+        }>;
         requestPromise: Promise<unknown>;
     }>;
     /**
@@ -107,11 +110,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 timeout and user-provided signal.
-     * @param signal - A user-provided signal.
-     * @returns An AbortSignal that triggers when either the timeout or user-provided signal aborts.
-     */
-    protected combineSignals(signal?: AbortSignal): AbortSignal;
 }
 //# 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,EAAE,qBAAqB,EAAE,KAAK,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1F;;GAEG;AACH,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;;GAEG;AACH,qBAAa,kBAAmB,YAAW,iBAAiB,EAAE,sBAAsB;IAChF,qDAAqD;IACrD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,iDAAiD;IACjD,SAAS,CAAC,YAAY,EAAE,0BAA0B,CAAC;IAEnD,6CAA6C;IAC7C,SAAS,CAAC,SAAS,EAAE,sBAAsB,CAAC;IAE5C;;;;OAIG;IACH,SAAS,CAAC,cAAc,EAAE,GAAG,CACzB,MAAM,EACN;QACI,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KACpC,CACJ,CAUG;IAEJ;;;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;IAwC/C;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAUvG;;;;;;;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;IAqDxB;;;;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,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW;CAM9D"}
+{"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,6BAA6B,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1F;;GAEG;AACH,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;;GAEG;AACH,qBAAa,kBAAmB,YAAW,iBAAiB,EAAE,sBAAsB;IAChF,qDAAqD;IACrD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,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,CACV,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,EAC3B;YACI,OAAO,EAAE,MAAM,CAAC;YAChB,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;SACxD,CACJ,CAAC;QACF,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;IAwC/C;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAevG;;;;;;;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/esm/src/transports/websocket/websocket_transport.js

@@ -33,8 +33,9 @@ export class WebSocketTransport {
         });
         /**
          * Map of active subscriptions.
-         * - Key: Unique subscription identifier (stringified payload)
-         * - Value: Subscription info containing payload and listener mappings
+         * - Key: Unique subscription identifier based on payload
+         * - Value: Subscription info containing the subscription request promise
+         *   and a map of listeners to their metadata (channel + unsubscribe function).
          */
         Object.defineProperty(this, "_subscriptions", {
             enumerable: true,
@@ -89,8 +90,8 @@ export class WebSocketTransport {
                 this._keepAliveTimer = undefined;
             }
             // Clear all subscriptions
-            for (const [_, { channel, listeners }] of this._subscriptions.entries()) {
-                for (const [listener] of listeners) {
+            for (const subscriptionInfo of this._subscriptions.values()) {
+                for (const [listener, { channel }] of subscriptionInfo.listeners) {
                     this._hlEvents.removeEventListener(channel, listener);
                 }
             }
@@ -112,7 +113,11 @@ export class WebSocketTransport {
             throw new Error("Explorer requests are not supported in the Hyperliquid WebSocket API.");
         }
         // Send the request and wait for a response
-        return this._wsRequester.request("post", { type, payload }, this.combineSignals(signal));
+        const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+        const combinedSignal = timeoutSignal && signal
+            ? AbortSignal.any([timeoutSignal, signal])
+            : timeoutSignal ?? signal;
+        return this._wsRequester.request("post", { type, payload }, combinedSignal);
     }
     /**
      * Subscribes to a Hyperliquid event channel.
@@ -124,48 +129,62 @@ export class WebSocketTransport {
      */
     async subscribe(channel, payload, listener, signal) {
         // Create a unique identifier for the subscription
-        const id = `${channel}::${WebSocketRequestDispatcher.requestToId(payload)}`;
+        const id = WebSocketRequestDispatcher.requestToId(payload);
         // Initialize new subscription, if it doesn't exist
         let subscriptionInfo = this._subscriptions.get(id);
         if (!subscriptionInfo) {
             // Send subscription request
-            const requestPromise = this._wsRequester.request("subscribe", payload, this.combineSignals(signal))
-                .catch((error) => {
-                this._subscriptions.delete(id);
-                throw error;
-            });
+            const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+            const combinedSignal = timeoutSignal && signal
+                ? AbortSignal.any([timeoutSignal, signal])
+                : timeoutSignal ?? signal;
+            const requestPromise = this._wsRequester.request("subscribe", payload, combinedSignal);
             // Cache subscription info
-            subscriptionInfo = { channel, listeners: new Map(), requestPromise };
+            subscriptionInfo = { listeners: new Map(), requestPromise };
             this._subscriptions.set(id, subscriptionInfo);
         }
-        // Check if we already have an unsubscribe function for this listener
-        let unsubscribe = subscriptionInfo.listeners.get(listener);
-        if (!unsubscribe) {
-            // Create new unsubscribe function if none exists
-            unsubscribe = async (signal) => {
+        // Initialize new listener, if it doesn't exist
+        let listenerInfo = subscriptionInfo.listeners.get(listener);
+        if (!listenerInfo) {
+            // Create new unsubscribe function
+            const unsubscribe = async (signal) => {
                 // Remove listener and cleanup
                 this._hlEvents.removeEventListener(channel, listener);
                 const isDeleted = subscriptionInfo.listeners.delete(listener);
                 // If no listeners remain, remove subscription entirely
                 // `isDeleted` means that the map had a listener before and became 0 after that
                 if (subscriptionInfo.listeners.size === 0 && isDeleted) {
+                    // Cleanup subscription
                     this._subscriptions.delete(id);
-                    await this._wsRequester.request("unsubscribe", payload, this.combineSignals(signal));
+                    // Send unsubscription request
+                    const timeoutSignal = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
+                    const combinedSignal = timeoutSignal && signal
+                        ? AbortSignal.any([timeoutSignal, signal])
+                        : timeoutSignal ?? signal;
+                    await this._wsRequester.request("unsubscribe", payload, combinedSignal);
                 }
             };
-            // Add event listener & Cache unsubscribe function
+            // Cache listener info
+            listenerInfo = { channel, unsubscribe };
+            subscriptionInfo.listeners.set(listener, listenerInfo);
+            // Add event listener
             this._hlEvents.addEventListener(channel, listener);
-            subscriptionInfo.listeners.set(listener, unsubscribe);
         }
         // Wait for the initial subscription request to complete
         await subscriptionInfo.requestPromise.catch((error) => {
-            // Cleanup the subscription and rethrow the error
+            // Remove listener and cleanup
             this._hlEvents.removeEventListener(channel, listener);
             subscriptionInfo.listeners.delete(listener);
+            // If no listeners remain, remove subscription entirely
+            if (subscriptionInfo.listeners.size === 0)
+                this._subscriptions.delete(id);
+            // Rethrow the error
             throw error;
         });
         // Return subscription control object
-        return { unsubscribe };
+        return {
+            unsubscribe: listenerInfo.unsubscribe,
+        };
     }
     /**
      * Waits until the WebSocket connection is ready.
@@ -217,17 +236,4 @@ export class WebSocketTransport {
             this.socket.close();
         });
     }
-    /**
-     * Combines timeout and user-provided signal.
-     * @param signal - A user-provided signal.
-     * @returns An AbortSignal that triggers when either the timeout or user-provided signal aborts.
-     */
-    combineSignals(signal) {
-        const signals = [];
-        if (this.timeout)
-            signals.push(AbortSignal.timeout(this.timeout));
-        if (signal)
-            signals.push(signal);
-        return signals.length > 1 ? AbortSignal.any(signals) : signals[0];
-    }
 }

package/esm/src/types/common.d.ts

@@ -0,0 +1,3 @@
+/** Hexadecimal string starting with `0x`. */
+export type Hex = `0x${string}`;
+//# sourceMappingURL=common.d.ts.map

package/esm/src/types/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/src/types/common.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,MAAM,MAAM,GAAG,GAAG,KAAK,MAAM,EAAE,CAAC"}

package/esm/src/types/common.js

@@ -0,0 +1 @@
+export {};

package/esm/src/types/exchange/common.d.ts

@@ -0,0 +1,36 @@
+import type { Hex } from "../common.js";
+import type { TIF } from "../info/orders.js";
+/** Order parameters. */
+export type OrderParams = {
+    /** Asset ID. */
+    a: number;
+    /** Position side (`true` for long, `false` for short). */
+    b: boolean;
+    /** Price. */
+    p: string;
+    /** Size (in base currency units). */
+    s: string;
+    /** Is reduce-only? */
+    r: boolean;
+    /** Order type. */
+    t: {
+        /** Limit order parameters. */
+        limit: {
+            /** Time-in-force. */
+            tif: TIF;
+        };
+    } | {
+        /** Trigger order parameters. */
+        trigger: {
+            /** Is market order? */
+            isMarket: boolean;
+            /** Trigger price. */
+            triggerPx: string;
+            /** Indicates whether it is take profit or stop loss. */
+            tpsl: "tp" | "sl";
+        };
+    };
+    /** Client Order ID. */
+    c?: Hex;
+};
+//# sourceMappingURL=common.d.ts.map

package/esm/src/types/exchange/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/src/types/exchange/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wBAAwB;AACxB,MAAM,MAAM,WAAW,GAAG;IACtB,gBAAgB;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,0DAA0D;IAC1D,CAAC,EAAE,OAAO,CAAC;IACX,aAAa;IACb,CAAC,EAAE,MAAM,CAAC;IACV,qCAAqC;IACrC,CAAC,EAAE,MAAM,CAAC;IACV,sBAAsB;IACtB,CAAC,EAAE,OAAO,CAAC;IACX,kBAAkB;IAClB,CAAC,EACK;QACE,8BAA8B;QAC9B,KAAK,EAAE;YACH,qBAAqB;YACrB,GAAG,EAAE,GAAG,CAAC;SACZ,CAAC;KACL,GACC;QACE,gCAAgC;QAChC,OAAO,EAAE;YACL,uBAAuB;YACvB,QAAQ,EAAE,OAAO,CAAC;YAClB,qBAAqB;YACrB,SAAS,EAAE,MAAM,CAAC;YAClB,wDAAwD;YACxD,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;SACrB,CAAC;KACL,CAAC;IACN,uBAAuB;IACvB,CAAC,CAAC,EAAE,GAAG,CAAC;CACX,CAAC"}

package/esm/src/types/exchange/common.js

@@ -0,0 +1 @@
+export {};