@nktkas/hyperliquid 0.13.1 → 0.14.0

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

@@ -1,10 +1,10 @@
-import { ReconnectingWebSocket, type ReconnectingWebSocketOptions } from "./reconnecting_websocket.js";
-import { HyperliquidEventTarget } from "./hyperliquid_event_target.js";
-import { WebSocketRequestDispatcher } from "./websocket_request_dispatcher.js";
-import type { IRequestTransport, ISubscriptionTransport, Subscription } from "../base.js";
-/**
- * Configuration options for the WebSocket transport layer.
- */
+import { ReconnectingWebSocket, 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";
+/** Configuration options for the WebSocket transport layer. */
 export interface WebSocketTransportOptions {
     /**
      * The WebSocket URL.
@@ -36,24 +36,22 @@ export interface WebSocketTransportOptions {
      */
     reconnect?: ReconnectingWebSocketOptions;
 }
-/**
- * WebSocket implementation of the REST and Subscription transport interfaces.
- */
+/** WebSocket implementation of the REST and Subscription transport interfaces. */
 export declare class WebSocketTransport implements IRequestTransport, ISubscriptionTransport {
     /** The interval timer ID for keep-alive messages. */
-    protected _keepAliveTimer: number | undefined;
+    protected _keepAliveTimer: number | null;
     /** The WebSocket request dispatcher instance. */
     protected _wsRequester: WebSocketRequestDispatcher;
     /** The Hyperliquid event target instance. */
     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, (signal?: AbortSignal) => Promise<void>>;
         requestPromise: Promise<unknown>;
     }>;
     /**
@@ -107,11 +105,7 @@ 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;
+    /** 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,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,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,QAAQ,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAavG;;;;;;;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"}

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

@@ -1,237 +1,250 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketTransport = void 0;
-const reconnecting_websocket_js_1 = require("./reconnecting_websocket.js");
-const hyperliquid_event_target_js_1 = require("./hyperliquid_event_target.js");
-const websocket_request_dispatcher_js_1 = require("./websocket_request_dispatcher.js");
-/**
- * WebSocket implementation of the REST and Subscription transport interfaces.
- */
-class WebSocketTransport {
-    /**
-     * Creates a new WebSocket transport instance.
-     * @param options - Configuration options for the WebSocket transport layer.
-     */
-    constructor(options) {
-        /** The interval timer ID for keep-alive messages. */
-        Object.defineProperty(this, "_keepAliveTimer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** The WebSocket request dispatcher instance. */
-        Object.defineProperty(this, "_wsRequester", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** The Hyperliquid event target instance. */
-        Object.defineProperty(this, "_hlEvents", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "./_reconnecting_websocket.js", "./_hyperliquid_event_target.js", "./_websocket_request_dispatcher.js"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.WebSocketTransport = exports.WebSocketRequestError = void 0;
+    const _reconnecting_websocket_js_1 = require("./_reconnecting_websocket.js");
+    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; } });
+    /** WebSocket implementation of the REST and Subscription transport interfaces. */
+    class WebSocketTransport {
         /**
-         * Map of active subscriptions.
-         * - Key: Unique subscription identifier (stringified payload)
-         * - Value: Subscription info containing payload and listener mappings
+         * Creates a new WebSocket transport instance.
+         * @param options - Configuration options for the WebSocket transport layer.
          */
-        Object.defineProperty(this, "_subscriptions", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Map()
-        });
+        constructor(options) {
+            /** The interval timer ID for keep-alive messages. */
+            Object.defineProperty(this, "_keepAliveTimer", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: null
+            });
+            /** The WebSocket request dispatcher instance. */
+            Object.defineProperty(this, "_wsRequester", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** The Hyperliquid event target instance. */
+            Object.defineProperty(this, "_hlEvents", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /**
+             * Map of active subscriptions.
+             * - 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,
+                configurable: true,
+                writable: true,
+                value: new Map()
+            });
+            /**
+             * Request timeout in ms.
+             * Set to `null` to disable.
+             */
+            Object.defineProperty(this, "timeout", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** Keep-alive configuration settings. */
+            Object.defineProperty(this, "keepAlive", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            /** The WebSocket that is used for communication. */
+            Object.defineProperty(this, "socket", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
+            this.socket = new _reconnecting_websocket_js_1.ReconnectingWebSocket(options?.url ?? "wss://api.hyperliquid.xyz/ws", undefined, options?.reconnect);
+            this._hlEvents = new _hyperliquid_event_target_js_1.HyperliquidEventTarget(this.socket);
+            this._wsRequester = new _websocket_request_dispatcher_js_1.WebSocketRequestDispatcher(this.socket, this._hlEvents);
+            this.timeout = options?.timeout === undefined ? 10_000 : options.timeout;
+            this.keepAlive = {
+                interval: options?.keepAlive?.interval === undefined ? 20_000 : options.keepAlive.interval,
+            };
+            // Initialize listeners
+            this.socket.addEventListener("open", () => {
+                // Start keep-alive timer
+                if (this.keepAlive.interval && this._keepAliveTimer === null) {
+                    this._keepAliveTimer = setInterval(() => {
+                        this.socket.send(JSON.stringify({ method: "ping" }));
+                    }, this.keepAlive.interval);
+                }
+            });
+            this.socket.addEventListener("close", () => {
+                // Clear keep-alive timer
+                if (this._keepAliveTimer !== null) {
+                    clearInterval(this._keepAliveTimer);
+                    this._keepAliveTimer = null;
+                }
+                // Clear all subscriptions
+                for (const subscriptionInfo of this._subscriptions.values()) {
+                    for (const [_, unsubscribe] of subscriptionInfo.listeners) {
+                        unsubscribe();
+                    }
+                }
+            });
+        }
         /**
-         * Request timeout in ms.
-         * Set to `null` to disable.
+         * Sends a request to the Hyperliquid API via WebSocket.
+         * @param endpoint - The API endpoint to send the request to.
+         * @param payload - The payload to send with the request.
+         * @param signal - An optional abort signal.
+         * @returns A promise that resolves with parsed JSON response body.
+         * @throws {WebSocketRequestError} - An error that occurs when a WebSocket request fails.
+         * @note Explorer requests are not supported in the Hyperliquid WebSocket API.
          */
-        Object.defineProperty(this, "timeout", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** Keep-alive configuration settings. */
-        Object.defineProperty(this, "keepAlive", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** The WebSocket that is used for communication. */
-        Object.defineProperty(this, "socket", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.socket = new reconnecting_websocket_js_1.ReconnectingWebSocket(options?.url ?? "wss://api.hyperliquid.xyz/ws", undefined, options?.reconnect);
-        this._hlEvents = new hyperliquid_event_target_js_1.HyperliquidEventTarget(this.socket);
-        this._wsRequester = new websocket_request_dispatcher_js_1.WebSocketRequestDispatcher(this.socket, this._hlEvents);
-        this.timeout = options?.timeout === undefined ? 10_000 : options.timeout;
-        this.keepAlive = {
-            interval: options?.keepAlive?.interval === undefined ? 20_000 : options.keepAlive.interval,
-        };
-        // Initialize listeners
-        this.socket.addEventListener("open", () => {
-            // Start keep-alive timer
-            if (this.keepAlive.interval && !this._keepAliveTimer) {
-                this._keepAliveTimer = setInterval(() => {
-                    this.socket.send(JSON.stringify({ method: "ping" }));
-                }, this.keepAlive.interval);
+        request(type, payload, signal) {
+            // Reject explorer requests because they are not supported by the Hyperliquid WebSocket API
+            if (type === "explorer") {
+                return Promise.reject(new _websocket_request_dispatcher_js_1.WebSocketRequestError("Explorer requests are not supported in the Hyperliquid WebSocket API."));
             }
-        });
-        this.socket.addEventListener("close", () => {
-            // Clear keep-alive timer
-            if (this._keepAliveTimer) {
-                clearInterval(this._keepAliveTimer);
-                this._keepAliveTimer = undefined;
+            // Send the request and wait for a response
+            const combinedSignal = this._combineTimeoutWithSignal(this.timeout, signal);
+            return this._wsRequester.request("post", { type, payload }, combinedSignal);
+        }
+        /**
+         * Subscribes to a Hyperliquid event channel.
+         * @param channel - The event channel to listen to.
+         * @param payload - A payload to send with the subscription request.
+         * @param listener - A function to call when the event is dispatched.
+         * @param signal - An optional abort signal for canceling the subscription request.
+         * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+         */
+        async subscribe(channel, payload, listener, signal) {
+            // Create a unique identifier for the subscription
+            const id = _websocket_request_dispatcher_js_1.WebSocketRequestDispatcher.requestToId(payload);
+            // Initialize new subscription, if it doesn't exist
+            let subscription = this._subscriptions.get(id);
+            if (!subscription) {
+                // Send subscription request
+                const combinedSignal = this._combineTimeoutWithSignal(this.timeout, signal);
+                const requestPromise = this._wsRequester.request("subscribe", payload, combinedSignal);
+                // Cache subscription info
+                subscription = { listeners: new Map(), requestPromise };
+                this._subscriptions.set(id, subscription);
             }
-            // Clear all subscriptions
-            for (const [_, { channel, listeners }] of this._subscriptions.entries()) {
-                for (const [listener] of listeners) {
+            // Initialize new listener, if it doesn't exist
+            let unsubscribe = subscription.listeners.get(listener);
+            if (!unsubscribe) {
+                // Create new unsubscribe function
+                unsubscribe = async (signal) => {
+                    // Remove listener and cleanup
                     this._hlEvents.removeEventListener(channel, listener);
-                }
+                    const subscription = this._subscriptions.get(id);
+                    subscription?.listeners.delete(listener);
+                    // If no listeners remain, remove subscription entirely
+                    if (subscription?.listeners.size === 0) {
+                        // Cleanup subscription
+                        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);
+                            await this._wsRequester.request("unsubscribe", payload, combinedSignal);
+                        }
+                    }
+                };
+                // Add listener and cache unsubscribe function
+                this._hlEvents.addEventListener(channel, listener);
+                subscription.listeners.set(listener, unsubscribe);
             }
-            this._subscriptions.clear();
-        });
-    }
-    /**
-     * Sends a request to the Hyperliquid API via WebSocket.
-     * @param endpoint - The API endpoint to send the request to.
-     * @param payload - The payload to send with the request.
-     * @param signal - An optional abort signal.
-     * @returns A promise that resolves with parsed JSON response body.
-     * @throws {WebSocketRequestError} - An error that occurs when a WebSocket request fails.
-     * @note Explorer requests are not supported in the Hyperliquid WebSocket API.
-     */
-    request(type, payload, signal) {
-        // Reject explorer requests because they are not supported by the Hyperliquid WebSocket API
-        if (type === "explorer") {
-            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));
-    }
-    /**
-     * Subscribes to a Hyperliquid event channel.
-     * @param channel - The event channel to listen to.
-     * @param payload - A payload to send with the subscription request.
-     * @param listener - A function to call when the event is dispatched.
-     * @param signal - An optional abort signal for canceling the subscription request.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
-     */
-    async subscribe(channel, payload, listener, signal) {
-        // Create a unique identifier for the subscription
-        const id = `${channel}::${websocket_request_dispatcher_js_1.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;
-            });
-            // Cache subscription info
-            subscriptionInfo = { channel, 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) => {
+            // Wait for the initial subscription request to complete
+            await subscription.requestPromise.catch((error) => {
                 // Remove listener and cleanup
                 this._hlEvents.removeEventListener(channel, listener);
-                const isDeleted = subscriptionInfo.listeners.delete(listener);
+                const subscription = this._subscriptions.get(id);
+                subscription?.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) {
+                if (subscription?.listeners.size === 0) {
                     this._subscriptions.delete(id);
-                    await this._wsRequester.request("unsubscribe", payload, this.combineSignals(signal));
                 }
-            };
-            // Add event listener & Cache unsubscribe function
-            this._hlEvents.addEventListener(channel, listener);
-            subscriptionInfo.listeners.set(listener, unsubscribe);
+                // Rethrow the error
+                throw error;
+            });
+            // Return subscription control object
+            return { unsubscribe };
+        }
+        /**
+         * Waits until the WebSocket connection is ready.
+         * @param signal - An optional abort signal.
+         * @returns A promise that resolves when the connection is ready.
+         */
+        ready(signal) {
+            return new Promise((resolve, reject) => {
+                const combinedSignal = signal
+                    ? AbortSignal.any([this.socket.terminationSignal, signal])
+                    : this.socket.terminationSignal;
+                if (combinedSignal.aborted)
+                    return reject(combinedSignal.reason);
+                if (this.socket.readyState === WebSocket.OPEN)
+                    return resolve();
+                const handleOpen = () => {
+                    combinedSignal.removeEventListener("abort", handleAbort);
+                    resolve();
+                };
+                const handleAbort = () => {
+                    this.socket.removeEventListener("open", handleOpen);
+                    reject(combinedSignal.reason);
+                };
+                this.socket.addEventListener("open", handleOpen, { once: true });
+                combinedSignal.addEventListener("abort", handleAbort, { once: true });
+            });
+        }
+        /**
+         * Closes the WebSocket connection and waits until it is fully closed.
+         * @param signal - An optional abort signal.
+         * @returns A promise that resolves when the connection is fully closed.
+         */
+        close(signal) {
+            return new Promise((resolve, reject) => {
+                if (signal?.aborted)
+                    return reject(signal.reason);
+                if (this.socket.readyState === WebSocket.CLOSED)
+                    return resolve();
+                const handleClose = () => {
+                    signal?.removeEventListener("abort", handleAbort);
+                    resolve();
+                };
+                const handleAbort = () => {
+                    this.socket.removeEventListener("close", handleClose);
+                    reject(signal?.reason);
+                };
+                this.socket.addEventListener("close", handleClose, { once: true });
+                signal?.addEventListener("abort", handleAbort, { once: true });
+                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]);
         }
-        // Wait for the initial subscription request to complete
-        await subscriptionInfo.requestPromise.catch((error) => {
-            // Cleanup the subscription and rethrow the error
-            this._hlEvents.removeEventListener(channel, listener);
-            subscriptionInfo.listeners.delete(listener);
-            throw error;
-        });
-        // Return subscription control object
-        return { unsubscribe };
-    }
-    /**
-     * Waits until the WebSocket connection is ready.
-     * @param signal - An optional abort signal.
-     * @returns A promise that resolves when the connection is ready.
-     */
-    ready(signal) {
-        return new Promise((resolve, reject) => {
-            const combinedSignal = signal
-                ? AbortSignal.any([this.socket.terminationSignal, signal])
-                : this.socket.terminationSignal;
-            if (combinedSignal.aborted)
-                return reject(combinedSignal.reason);
-            if (this.socket.readyState === WebSocket.OPEN)
-                return resolve();
-            const handleOpen = () => {
-                combinedSignal.removeEventListener("abort", handleAbort);
-                resolve();
-            };
-            const handleAbort = () => {
-                this.socket.removeEventListener("open", handleOpen);
-                reject(combinedSignal.reason);
-            };
-            this.socket.addEventListener("open", handleOpen, { once: true });
-            combinedSignal.addEventListener("abort", handleAbort, { once: true });
-        });
-    }
-    /**
-     * Closes the WebSocket connection and waits until it is fully closed.
-     * @param signal - An optional abort signal.
-     * @returns A promise that resolves when the connection is fully closed.
-     */
-    close(signal) {
-        return new Promise((resolve, reject) => {
-            if (signal?.aborted)
-                return reject(signal.reason);
-            if (this.socket.readyState === WebSocket.CLOSED)
-                return resolve();
-            const handleClose = () => {
-                signal?.removeEventListener("abort", handleAbort);
-                resolve();
-            };
-            const handleAbort = () => {
-                this.socket.removeEventListener("close", handleClose);
-                reject(signal?.reason);
-            };
-            this.socket.addEventListener("close", handleClose, { once: true });
-            signal?.addEventListener("abort", handleAbort, { once: true });
-            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];
     }
-}
-exports.WebSocketTransport = WebSocketTransport;
+    exports.WebSocketTransport = WebSocketTransport;
+});