@tigeropenapi/tigeropen 0.1.0 → 0.3.0

package/dist/cjs/push/push-client.js

@@ -1,19 +1,78 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PushClient = exports.ConnectionState = void 0;
+/**
+ * PushClient - TCP + TLS push client (Protobuf protocol)
+ *
+ * Connects to the push server via raw TCP + TLS to receive real-time
+ * market data and account push notifications.
+ * Uses varint32 length-prefixed + Protobuf binary frame format,
+ * aligned with the Java SDK's Netty + Protobuf implementation.
+ * Supports connection authentication, subscribe/unsubscribe, callbacks,
+ * heartbeat keep-alive, and automatic reconnection.
+ */
+const tls = __importStar(require("tls"));
 const signer_1 = require("../signer/signer");
 const push_message_1 = require("./push-message");
-/** 默认推送服务器地址 */
-const DEFAULT_PUSH_URL = 'wss://openapi-push.tigerfintech.com';
-/** 默认心跳间隔（毫秒） */
+const Request_1 = require("./pb/Request");
+const Response_1 = require("./pb/Response");
+const SocketCommon_1 = require("./pb/SocketCommon");
+const varint_1 = require("./varint");
+const proto_message_1 = require("./proto-message");
+/** Default push server host */
+const DEFAULT_PUSH_HOST = 'openapi.tigerfintech.com';
+/** Default push server port */
+const DEFAULT_PUSH_PORT = 9883;
+/** Default heartbeat interval (ms) */
 const DEFAULT_HEARTBEAT_INTERVAL = 10000;
-/** 默认重连间隔（毫秒） */
+/** Default reconnect interval (ms) */
 const DEFAULT_RECONNECT_INTERVAL = 5000;
-/** 最大重连间隔（毫秒） */
+/** Max reconnect interval (ms) */
 const MAX_RECONNECT_INTERVAL = 60000;
-/** 默认连接超时（毫秒） */
+/** Default connect timeout (ms) */
 const DEFAULT_CONNECT_TIMEOUT = 30000;
-/** 连接状态 */
+/** SDK version identifier */
+const SDK_VERSION = 'typescript/0.1.0';
+/** Protocol version */
+const ACCEPT_VERSION = '1.0';
+/** Default send heartbeat interval (ms) */
+const DEFAULT_SEND_INTERVAL = 10000;
+/** Default receive heartbeat interval (ms) */
+const DEFAULT_RECEIVE_INTERVAL = 10000;
+/** Connection state */
 var ConnectionState;
 (function (ConnectionState) {
     ConnectionState[ConnectionState["Disconnected"] = 0] = "Disconnected";
@@ -21,151 +80,220 @@ var ConnectionState;
     ConnectionState[ConnectionState["Connected"] = 2] = "Connected";
 })(ConnectionState || (exports.ConnectionState = ConnectionState = {}));
 /**
- * PushClient WebSocket 推送客户端
+ * PushClient - TCP + TLS push client (Protobuf protocol)
  */
 class PushClient {
     constructor(config, options) {
-        this.ws = null;
+        this.socket = null;
         this._state = ConnectionState.Disconnected;
         this.callbacks = {};
-        /** 订阅状态管理：subject -> Set<symbol> */
+        /** Subscription state: subject -> Set<symbol> */
         this.subscriptions = new Map();
-        /** 账户级别订阅 */
+        /** Account-level subscriptions */
         this.accountSubs = new Set();
         this.heartbeatTimer = null;
         this.reconnectTimer = null;
         this.stopped = false;
-        /** 可注入的 WebSocket 工厂（用于测试） */
-        this.wsFactory = null;
+        /** TCP stream receive buffer */
+        this.recvBuffer = Buffer.alloc(0);
+        /** Injectable TLS socket factory (for testing) */
+        this.socketFactory = null;
         this.config = config;
-        this.pushUrl = options?.pushUrl ?? DEFAULT_PUSH_URL;
+        this.pushHost = options?.pushHost ?? DEFAULT_PUSH_HOST;
+        this.pushPort = options?.pushPort ?? DEFAULT_PUSH_PORT;
         this.heartbeatInterval = options?.heartbeatInterval ?? DEFAULT_HEARTBEAT_INTERVAL;
         this.reconnectInterval = options?.reconnectInterval ?? DEFAULT_RECONNECT_INTERVAL;
         this.autoReconnect = options?.autoReconnect ?? true;
         this.connectTimeout = options?.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT;
+        this.useFullTick = options?.useFullTick ?? false;
     }
-    /** 获取当前连接状态 */
+    /** Get current connection state */
     get state() {
         return this._state;
     }
-    /** 设置回调函数集合 */
+    /** Set callback functions */
     setCallbacks(cb) {
         this.callbacks = cb;
     }
-    /** 连接到推送服务器并进行认证 */
+    /** Connect to the push server and authenticate */
     connect() {
         return new Promise((resolve, reject) => {
             if (this._state !== ConnectionState.Disconnected) {
-                reject(new Error('客户端已连接或正在连接中'));
+                reject(new Error('Client is already connected or connecting'));
                 return;
             }
             this._state = ConnectionState.Connecting;
             this.stopped = false;
-            const ws = this.createWebSocket(this.pushUrl);
-            this.ws = ws;
+            this.recvBuffer = Buffer.alloc(0);
+            const socket = this.createSocket(this.pushHost, this.pushPort);
+            this.socket = socket;
+            let settled = false;
             const timeout = setTimeout(() => {
-                ws.close();
-                this._state = ConnectionState.Disconnected;
-                this.ws = null;
-                reject(new Error('连接超时'));
+                if (!settled) {
+                    settled = true;
+                    socket.destroy();
+                    this._state = ConnectionState.Disconnected;
+                    this.socket = null;
+                    reject(new Error('Connect timeout'));
+                }
             }, this.connectTimeout);
-            ws.onopen = () => {
-                clearTimeout(timeout);
-                // 发送认证消息
-                try {
-                    this.authenticate();
+            // Resolve once we receive CONNECTED response from server
+            const onConnected = () => {
+                if (!settled) {
+                    settled = true;
+                    clearTimeout(timeout);
                     this._state = ConnectionState.Connected;
                     this.startHeartbeat();
                     this.callbacks.onConnect?.();
                     resolve();
                 }
+            };
+            socket.on('connect', () => {
+                // TLS handshake complete, send authentication message
+                try {
+                    this.authenticate();
+                }
                 catch (err) {
-                    ws.close();
-                    this._state = ConnectionState.Disconnected;
-                    this.ws = null;
-                    reject(err);
+                    if (!settled) {
+                        settled = true;
+                        clearTimeout(timeout);
+                        socket.destroy();
+                        this._state = ConnectionState.Disconnected;
+                        this.socket = null;
+                        reject(err);
+                    }
                 }
-            };
-            ws.onmessage = (ev) => {
-                this.handleMessage(String(ev.data));
-            };
-            ws.onclose = () => {
+            });
+            socket.on('data', (chunk) => {
+                this.handleData(chunk, onConnected);
+            });
+            socket.on('close', () => {
                 if (this.stopped)
                     return;
                 this.stopHeartbeat();
                 const wasConnected = this._state === ConnectionState.Connected;
                 this._state = ConnectionState.Disconnected;
-                this.ws = null;
+                this.socket = null;
                 if (wasConnected && this.autoReconnect && !this.stopped) {
                     this.scheduleReconnect();
                 }
-            };
-            ws.onerror = (ev) => {
-                if (this._state === ConnectionState.Connecting) {
+            });
+            socket.on('error', (err) => {
+                if (!settled) {
+                    settled = true;
                     clearTimeout(timeout);
                     this._state = ConnectionState.Disconnected;
-                    this.ws = null;
-                    reject(new Error('WebSocket 连接失败'));
+                    this.socket = null;
+                    reject(new Error(`TLS connection failed: ${err.message}`));
                 }
                 else {
-                    this.callbacks.onError?.(new Error('WebSocket 错误'));
+                    this.callbacks.onError?.(new Error(`TLS error: ${err.message}`));
                 }
-            };
+            });
         });
     }
-    /** 断开连接 */
+    /** Disconnect from the push server */
     disconnect() {
         this.stopped = true;
         this.stopHeartbeat();
         this.clearReconnectTimer();
-        if (this.ws) {
-            this.ws.onclose = null;
-            this.ws.onerror = null;
-            this.ws.onmessage = null;
-            this.ws.close();
-            this.ws = null;
+        if (this.socket) {
+            // Send DISCONNECT message before closing
+            try {
+                const req = (0, proto_message_1.buildDisconnectMessage)();
+                this.sendMessage(req);
+            }
+            catch {
+                // Ignore send failure, continue closing
+            }
+            this.socket.destroy();
+            this.socket = null;
         }
         this._state = ConnectionState.Disconnected;
+        this.recvBuffer = Buffer.alloc(0);
         this.callbacks.onDisconnect?.();
     }
-    /** 发送认证消息 */
+    /** Send authentication message */
     authenticate() {
-        const ts = new Date().toISOString().replace('T', ' ').substring(0, 19);
+        // Sign content is the tigerId string itself (aligned with Java SDK)
         const sign = (0, signer_1.signWithRSA)(this.config.privateKey, this.config.tigerId);
-        const req = {
-            tigerId: this.config.tigerId,
-            sign,
-            timestamp: ts,
-            version: '2.0',
-        };
-        const msg = (0, push_message_1.createPushMessage)(push_message_1.MessageType.Connect, undefined, req);
-        this.sendMessage(msg);
+        const req = (0, proto_message_1.buildConnectMessage)(this.config.tigerId, sign, SDK_VERSION, ACCEPT_VERSION, DEFAULT_SEND_INTERVAL, DEFAULT_RECEIVE_INTERVAL, this.useFullTick);
+        this.sendMessage(req);
     }
-    /** 发送消息 */
+    /** Send a Protobuf Request message (varint32 length prefix + binary) */
     sendMessage(msg) {
-        if (!this.ws)
-            throw new Error('WebSocket 连接未建立');
-        this.ws.send((0, push_message_1.serializeMessage)(msg));
-    }
-    /** 创建 WebSocket 实例 */
-    createWebSocket(url) {
-        if (this.wsFactory)
-            return this.wsFactory(url);
-        // 动态导入 ws 库（Node.js 环境）
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        const WS = require('ws');
-        return new WS(url);
-    }
-    /** 心跳保活 */
+        if (!this.socket)
+            throw new Error('TLS connection not established');
+        const encoded = Request_1.Request.encode(msg).finish();
+        const framed = (0, varint_1.encodeVarint32)(encoded);
+        this.socket.write(framed);
+    }
+    /** Create a TLS socket instance */
+    createSocket(host, port) {
+        if (this.socketFactory)
+            return this.socketFactory(host, port);
+        return tls.connect({ host, port, rejectUnauthorized: false });
+    }
+    /** Handle incoming TCP data: buffer + decode varint32 frames */
+    handleData(chunk, onConnected) {
+        this.recvBuffer = Buffer.concat([this.recvBuffer, chunk]);
+        while (this.recvBuffer.length > 0) {
+            const frame = (0, varint_1.decodeVarint32)(new Uint8Array(this.recvBuffer));
+            if (!frame)
+                break; // Incomplete frame, wait for more data
+            this.recvBuffer = Buffer.from(frame.remaining);
+            // Deserialize Protobuf Response
+            let response;
+            try {
+                response = Response_1.Response.decode(frame.message);
+            }
+            catch {
+                this.callbacks.onError?.(new Error('Protobuf deserialization failed'));
+                continue;
+            }
+            this.handleResponse(response, onConnected);
+        }
+    }
+    /** Handle a decoded Response message */
+    handleResponse(response, onConnected) {
+        const cb = this.callbacks;
+        switch (response.command) {
+            case SocketCommon_1.SocketCommon_Command.CONNECTED:
+                // Server confirmed authentication
+                onConnected?.();
+                break;
+            case SocketCommon_1.SocketCommon_Command.HEARTBEAT:
+                // Heartbeat response, ignore
+                break;
+            case SocketCommon_1.SocketCommon_Command.MESSAGE:
+                if (response.body) {
+                    this.dispatchPushData(response.body);
+                }
+                break;
+            case SocketCommon_1.SocketCommon_Command.ERROR:
+                cb.onError?.(new Error(`Server error: ${response.msg ?? 'unknown error'}`));
+                // Check for kickout
+                if (response.msg && response.msg.toLowerCase().includes('kickout')) {
+                    cb.onKickout?.(response.msg);
+                }
+                break;
+            case SocketCommon_1.SocketCommon_Command.DISCONNECT:
+                cb.onDisconnect?.();
+                break;
+            default:
+                break;
+        }
+    }
+    /** Heartbeat keep-alive */
     startHeartbeat() {
         this.stopHeartbeat();
         this.heartbeatTimer = setInterval(() => {
             try {
-                const msg = (0, push_message_1.createPushMessage)(push_message_1.MessageType.Heartbeat);
-                this.sendMessage(msg);
+                const req = (0, proto_message_1.buildHeartBeatMessage)();
+                this.sendMessage(req);
             }
             catch {
-                // 心跳发送失败，连接可能已断开
+                // Heartbeat send failed, connection may be broken
             }
         }, this.heartbeatInterval);
     }
@@ -175,7 +303,7 @@ class PushClient {
             this.heartbeatTimer = null;
         }
     }
-    /** 自动重连 */
+    /** Auto reconnect with exponential backoff */
     scheduleReconnect() {
         let interval = this.reconnectInterval;
         const attempt = () => {
@@ -198,7 +326,7 @@ class PushClient {
             this.reconnectTimer = null;
         }
     }
-    /** 重连后恢复订阅 */
+    /** Resubscribe after reconnection */
     resubscribe() {
         for (const [subject, symbols] of this.subscriptions) {
             this.doSubscribe(subject, Array.from(symbols));
@@ -207,81 +335,81 @@ class PushClient {
             this.doSubscribe(subject, undefined, this.config.account);
         }
     }
-    /** 处理收到的消息 */
-    handleMessage(raw) {
-        let msg;
-        try {
-            msg = (0, push_message_1.deserializeMessage)(raw);
-        }
-        catch {
-            this.callbacks.onError?.(new Error('反序列化消息失败'));
-            return;
-        }
+    /** Dispatch push data to the appropriate callback based on dataType */
+    dispatchPushData(pushData) {
         const cb = this.callbacks;
-        switch (msg.type) {
-            case push_message_1.MessageType.Kickout:
-                cb.onKickout?.(msg.data);
-                break;
-            case push_message_1.MessageType.Error:
-                cb.onError?.(new Error(`服务端错误: ${msg.data}`));
-                break;
-            case push_message_1.MessageType.Quote:
-                cb.onQuote?.(msg.data);
-                break;
-            case push_message_1.MessageType.Tick:
-                cb.onTick?.(msg.data);
+        switch (pushData.dataType) {
+            case SocketCommon_1.SocketCommon_DataType.Quote:
+                if (pushData.quoteData)
+                    cb.onQuote?.(pushData.quoteData);
                 break;
-            case push_message_1.MessageType.Depth:
-                cb.onDepth?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.Option:
+                if (pushData.quoteData)
+                    cb.onOption?.(pushData.quoteData);
                 break;
-            case push_message_1.MessageType.Option:
-                cb.onOption?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.Future:
+                if (pushData.quoteData)
+                    cb.onFuture?.(pushData.quoteData);
                 break;
-            case push_message_1.MessageType.Future:
-                cb.onFuture?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.QuoteDepth:
+                if (pushData.quoteDepthData)
+                    cb.onDepth?.(pushData.quoteDepthData);
                 break;
-            case push_message_1.MessageType.Kline:
-                cb.onKline?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.TradeTick:
+                if (pushData.tradeTickData)
+                    cb.onTick?.(pushData.tradeTickData);
                 break;
-            case push_message_1.MessageType.Asset:
-                cb.onAsset?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.Asset:
+                if (pushData.assetData)
+                    cb.onAsset?.(pushData.assetData);
                 break;
-            case push_message_1.MessageType.Position:
-                cb.onPosition?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.Position:
+                if (pushData.positionData)
+                    cb.onPosition?.(pushData.positionData);
                 break;
-            case push_message_1.MessageType.Order:
-                cb.onOrder?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.OrderStatus:
+                if (pushData.orderStatusData)
+                    cb.onOrder?.(pushData.orderStatusData);
                 break;
-            case push_message_1.MessageType.Transaction:
-                cb.onTransaction?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.OrderTransaction:
+                if (pushData.orderTransactionData)
+                    cb.onTransaction?.(pushData.orderTransactionData);
                 break;
-            case push_message_1.MessageType.StockTop:
-                cb.onStockTop?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.StockTop:
+                if (pushData.stockTopData)
+                    cb.onStockTop?.(pushData.stockTopData);
                 break;
-            case push_message_1.MessageType.OptionTop:
-                cb.onOptionTop?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.OptionTop:
+                if (pushData.optionTopData)
+                    cb.onOptionTop?.(pushData.optionTopData);
                 break;
-            case push_message_1.MessageType.FullTick:
-                cb.onFullTick?.(msg.data);
+            case SocketCommon_1.SocketCommon_DataType.Kline:
+                if (pushData.klineData)
+                    cb.onKline?.(pushData.klineData);
                 break;
-            case push_message_1.MessageType.QuoteBBO:
-                cb.onQuoteBBO?.(msg.data);
+            default:
+                // FullTick and QuoteBBO use TradeTick/Quote dataType
+                // TickData (fullTick) via tickData field
+                if (pushData.tickData)
+                    cb.onFullTick?.(pushData.tickData);
                 break;
         }
     }
-    /** 内部订阅方法 */
+    /** Internal subscribe method */
     doSubscribe(subject, symbols, account, market) {
-        const req = { subject, symbols, account, market };
-        const msg = (0, push_message_1.createPushMessage)(push_message_1.MessageType.Subscribe, subject, req);
-        this.sendMessage(msg);
+        const dataType = (0, proto_message_1.subjectToDataType)(subject);
+        const symbolsStr = symbols ? symbols.join(',') : undefined;
+        const req = (0, proto_message_1.buildSubscribeMessage)(dataType, symbolsStr, account, market);
+        this.sendMessage(req);
     }
-    /** 内部退订方法 */
+    /** Internal unsubscribe method */
     doUnsubscribe(subject, symbols) {
-        const req = { subject, symbols };
-        const msg = (0, push_message_1.createPushMessage)(push_message_1.MessageType.Unsubscribe, subject, req);
-        this.sendMessage(msg);
+        const dataType = (0, proto_message_1.subjectToDataType)(subject);
+        const symbolsStr = symbols ? symbols.join(',') : undefined;
+        const req = (0, proto_message_1.buildUnSubscribeMessage)(dataType, symbolsStr);
+        this.sendMessage(req);
     }
-    /** 添加订阅记录 */
+    /** Add subscription record */
     addSubscription(subject, symbols) {
         if (!this.subscriptions.has(subject)) {
             this.subscriptions.set(subject, new Set());
@@ -290,7 +418,7 @@ class PushClient {
         for (const s of symbols)
             set.add(s);
     }
-    /** 移除订阅记录 */
+    /** Remove subscription record */
     removeSubscription(subject, symbols) {
         if (!symbols) {
             this.subscriptions.delete(subject);
@@ -304,110 +432,110 @@ class PushClient {
                 this.subscriptions.delete(subject);
         }
     }
-    // ===== 行情订阅/退订 =====
-    /** 订阅行情 */
+    // ===== Market data subscribe/unsubscribe =====
+    /** Subscribe to quotes */
     subscribeQuote(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Quote, symbols);
         this.addSubscription(push_message_1.SubjectType.Quote, symbols);
     }
-    /** 退订行情 */
+    /** Unsubscribe from quotes */
     unsubscribeQuote(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Quote, symbols);
         this.removeSubscription(push_message_1.SubjectType.Quote, symbols);
     }
-    /** 订阅逐笔成交 */
+    /** Subscribe to trade ticks */
     subscribeTick(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Tick, symbols);
         this.addSubscription(push_message_1.SubjectType.Tick, symbols);
     }
-    /** 退订逐笔成交 */
+    /** Unsubscribe from trade ticks */
     unsubscribeTick(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Tick, symbols);
         this.removeSubscription(push_message_1.SubjectType.Tick, symbols);
     }
-    /** 订阅深度行情 */
+    /** Subscribe to depth data */
     subscribeDepth(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Depth, symbols);
         this.addSubscription(push_message_1.SubjectType.Depth, symbols);
     }
-    /** 退订深度行情 */
+    /** Unsubscribe from depth data */
     unsubscribeDepth(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Depth, symbols);
         this.removeSubscription(push_message_1.SubjectType.Depth, symbols);
     }
-    /** 订阅期权行情 */
+    /** Subscribe to option quotes */
     subscribeOption(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Option, symbols);
         this.addSubscription(push_message_1.SubjectType.Option, symbols);
     }
-    /** 退订期权行情 */
+    /** Unsubscribe from option quotes */
     unsubscribeOption(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Option, symbols);
         this.removeSubscription(push_message_1.SubjectType.Option, symbols);
     }
-    /** 订阅期货行情 */
+    /** Subscribe to futures quotes */
     subscribeFuture(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Future, symbols);
         this.addSubscription(push_message_1.SubjectType.Future, symbols);
     }
-    /** 退订期货行情 */
+    /** Unsubscribe from futures quotes */
     unsubscribeFuture(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Future, symbols);
         this.removeSubscription(push_message_1.SubjectType.Future, symbols);
     }
-    /** 订阅 K 线 */
+    /** Subscribe to kline data */
     subscribeKline(symbols) {
         this.doSubscribe(push_message_1.SubjectType.Kline, symbols);
         this.addSubscription(push_message_1.SubjectType.Kline, symbols);
     }
-    /** 退订 K 线 */
+    /** Unsubscribe from kline data */
     unsubscribeKline(symbols) {
         this.doUnsubscribe(push_message_1.SubjectType.Kline, symbols);
         this.removeSubscription(push_message_1.SubjectType.Kline, symbols);
     }
-    // ===== 账户推送订阅/退订 =====
-    /** 订阅资产变动 */
+    // ===== Account push subscribe/unsubscribe =====
+    /** Subscribe to asset changes */
     subscribeAsset(account) {
         this.doSubscribe(push_message_1.SubjectType.Asset, undefined, account || this.config.account);
         this.accountSubs.add(push_message_1.SubjectType.Asset);
     }
-    /** 退订资产变动 */
+    /** Unsubscribe from asset changes */
     unsubscribeAsset() {
         this.doUnsubscribe(push_message_1.SubjectType.Asset);
         this.accountSubs.delete(push_message_1.SubjectType.Asset);
     }
-    /** 订阅持仓变动 */
+    /** Subscribe to position changes */
     subscribePosition(account) {
         this.doSubscribe(push_message_1.SubjectType.Position, undefined, account || this.config.account);
         this.accountSubs.add(push_message_1.SubjectType.Position);
     }
-    /** 退订持仓变动 */
+    /** Unsubscribe from position changes */
     unsubscribePosition() {
         this.doUnsubscribe(push_message_1.SubjectType.Position);
         this.accountSubs.delete(push_message_1.SubjectType.Position);
     }
-    /** 订阅订单状态 */
+    /** Subscribe to order status */
     subscribeOrder(account) {
         this.doSubscribe(push_message_1.SubjectType.Order, undefined, account || this.config.account);
         this.accountSubs.add(push_message_1.SubjectType.Order);
     }
-    /** 退订订单状态 */
+    /** Unsubscribe from order status */
     unsubscribeOrder() {
         this.doUnsubscribe(push_message_1.SubjectType.Order);
         this.accountSubs.delete(push_message_1.SubjectType.Order);
     }
-    /** 订阅成交明细 */
+    /** Subscribe to transaction details */
     subscribeTransaction(account) {
         this.doSubscribe(push_message_1.SubjectType.Transaction, undefined, account || this.config.account);
         this.accountSubs.add(push_message_1.SubjectType.Transaction);
     }
-    /** 退订成交明细 */
+    /** Unsubscribe from transaction details */
     unsubscribeTransaction() {
         this.doUnsubscribe(push_message_1.SubjectType.Transaction);
         this.accountSubs.delete(push_message_1.SubjectType.Transaction);
     }
-    // ===== 查询订阅状态 =====
-    /** 获取当前行情订阅状态 */
+    // ===== Query subscription state =====
+    /** Get current market data subscriptions */
     getSubscriptions() {
         const result = new Map();
         for (const [subject, symbols] of this.subscriptions) {
@@ -415,7 +543,7 @@ class PushClient {
         }
         return result;
     }
-    /** 获取账户级别订阅状态 */
+    /** Get account-level subscriptions */
     getAccountSubscriptions() {
         return Array.from(this.accountSubs);
     }