@tigeropenapi/tigeropen 0.4.0 → 0.4.6

package/dist/esm/config/client-config.js

@@ -8,11 +8,12 @@
  *
  * Priority: environment variables > code options (incl. config file) > defaults
  */
-import { readFileSync, existsSync } from 'fs';
+import { readFileSync, existsSync, statSync } from 'fs';
 import { join } from 'path';
 import { homedir, networkInterfaces } from 'os';
-import { parsePropertiesString } from './config-parser';
-import { queryDomains, resolveDynamicServerUrl, resolveDynamicQuoteServerUrl } from './domain';
+import { parsePropertiesString } from './config-parser.js';
+import { queryDomains, resolveDynamicServerUrl, resolveDynamicQuoteServerUrl } from './domain.js';
+import { TokenManager } from './token-manager.js';
 /** Default config file name */
 const CONFIG_FILE_NAME = 'tiger_openapi_config.properties';
 /** Defaults */
@@ -26,6 +27,7 @@ const ENV_TIGER_ID = 'TIGEROPEN_TIGER_ID';
 const ENV_PRIVATE_KEY = 'TIGEROPEN_PRIVATE_KEY';
 const ENV_ACCOUNT = 'TIGEROPEN_ACCOUNT';
 const ENV_TOKEN = 'TIGEROPEN_TOKEN';
+const ENV_TOKEN_FILE = 'TIGEROPEN_TOKEN_FILE';
 /**
  * Load and parse a Java-style properties file.
  *
@@ -99,7 +101,18 @@ export function createClientConfig(options) {
     // Load properties: explicit path > auto-discovery
     let fileProps = {};
     if (opts.propertiesFilePath) {
-        fileProps = loadPropertiesFile(opts.propertiesFilePath);
+        // Support both directory path and full file path
+        let filePath = opts.propertiesFilePath;
+        if (existsSync(filePath) && statSync(filePath).isDirectory()) {
+            filePath = join(filePath, CONFIG_FILE_NAME);
+        }
+        else if (!existsSync(filePath) && !filePath.endsWith('.properties')) {
+            // Path doesn't exist as-is; try treating it as a directory
+            const asDir = join(filePath, CONFIG_FILE_NAME);
+            if (existsSync(asDir))
+                filePath = asDir;
+        }
+        fileProps = loadPropertiesFile(filePath);
     }
     else {
         const discovered = discoverConfigFile();
@@ -132,6 +145,37 @@ export function createClientConfig(options) {
     if (envToken) {
         token = envToken;
     }
+    // Token loading priority: env TIGEROPEN_TOKEN > tokenLoader > token file (TIGEROPEN_TOKEN_FILE or default)
+    if (!token) {
+        if (opts.tokenLoader) {
+            // tokenLoader is async-capable; we do a best-effort synchronous call here.
+            // If the loader returns a Promise, the token will be set later via HttpClient.
+            try {
+                const result = opts.tokenLoader();
+                if (result instanceof Promise) {
+                    // Cannot await in sync constructor; HttpClient.startTokenAutoRefresh() will
+                    // resolve this Promise and sync the token after construction.
+                }
+                else if (result) {
+                    token = result;
+                }
+            }
+            catch {
+                // loader failed; leave token undefined
+            }
+        }
+        else {
+            // Load from token file: TIGEROPEN_TOKEN_FILE env var > default file
+            const tokenFilePath = process.env[ENV_TOKEN_FILE] || 'tiger_openapi_token.properties';
+            const tm = new TokenManager({ filePath: tokenFilePath });
+            try {
+                token = tm.loadTokenSync();
+            }
+            catch {
+                // file not found or no token field; leave token undefined
+            }
+        }
+    }
     // Validate required fields
     if (!tigerId) {
         throw new Error(`tigerId is required. Set it via options.tigerId, a config file, or the ${ENV_TIGER_ID} environment variable.`);
@@ -143,15 +187,16 @@ export function createClientConfig(options) {
     const enableDynamicDomain = opts.enableDynamicDomain ?? true;
     let serverUrl;
     let quoteServerUrl;
+    // Query dynamic domains once (may spawn a child process); reuse for both URLs.
+    let domainConf = {};
+    if (enableDynamicDomain && (!opts.serverUrl || !opts.quoteServerUrl)) {
+        domainConf = queryDomains(license);
+    }
     if (opts.serverUrl) {
         serverUrl = opts.serverUrl;
     }
     else {
-        let dynamicUrl = '';
-        if (enableDynamicDomain) {
-            const domainConf = queryDomains(license);
-            dynamicUrl = resolveDynamicServerUrl(domainConf, license);
-        }
+        const dynamicUrl = resolveDynamicServerUrl(domainConf, license);
         serverUrl = dynamicUrl || DEFAULT_SERVER_URL;
     }
     // Resolve quote server URL: explicit > dynamic domain > serverUrl fallback
@@ -159,11 +204,7 @@ export function createClientConfig(options) {
         quoteServerUrl = opts.quoteServerUrl;
     }
     else {
-        let dynamicQuoteUrl = '';
-        if (enableDynamicDomain) {
-            const domainConf = queryDomains(license);
-            dynamicQuoteUrl = resolveDynamicQuoteServerUrl(domainConf, license);
-        }
+        const dynamicQuoteUrl = resolveDynamicQuoteServerUrl(domainConf, license);
         quoteServerUrl = dynamicQuoteUrl || serverUrl;
     }
     return {
@@ -176,10 +217,13 @@ export function createClientConfig(options) {
         timeout: opts.timeout ?? DEFAULT_TIMEOUT,
         token,
         tokenRefreshDuration: opts.tokenRefreshDuration,
+        tokenCheckInterval: opts.tokenCheckInterval,
+        tokenLoader: opts.tokenLoader,
+        tokenWriter: opts.tokenWriter,
         serverUrl,
         quoteServerUrl,
         deviceId: detectDeviceId(),
-        tigerPublicKey: TIGER_PUBLIC_KEY,
+        tigerPublicKey: opts.tigerPublicKey ?? TIGER_PUBLIC_KEY,
     };
 }
 /**

package/dist/esm/config/index.js

@@ -1,6 +1,7 @@
 /**
  * 配置层导出
  */
-export { parsePropertiesFile, parsePropertiesString } from './config-parser';
-export { createClientConfig, loadPropertiesFile } from './client-config';
-export { queryDomains, resolveDynamicServerUrl, resolveDynamicQuoteServerUrl } from './domain';
+export { parsePropertiesFile, parsePropertiesString } from './config-parser.js';
+export { createClientConfig, loadPropertiesFile } from './client-config.js';
+export { TokenManager } from './token-manager.js';
+export { queryDomains, resolveDynamicServerUrl, resolveDynamicQuoteServerUrl } from './domain.js';

package/dist/esm/config/token-manager.js

@@ -6,7 +6,7 @@
  */
 import { readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { dirname } from 'path';
-import { parsePropertiesString } from './config-parser';
+import { parsePropertiesString } from './config-parser.js';
 /** 默认 Token 文件名 */
 const DEFAULT_TOKEN_FILE = 'tiger_openapi_token.properties';
 /** 默认刷新间隔（毫秒）：24 小时 */
@@ -18,6 +18,7 @@ export class TokenManager {
     constructor(options) {
         this.token = '';
         this.timer = null;
+        this.fileEnabled = options?.filePath !== undefined;
         this.filePath = options?.filePath ?? DEFAULT_TOKEN_FILE;
         this.refreshInterval = options?.refreshInterval ?? DEFAULT_REFRESH_INTERVAL;
         let dur = options?.refreshDuration ?? 0;
@@ -25,9 +26,39 @@ export class TokenManager {
             dur = 30;
         }
         this.refreshDuration = dur;
+        this.tokenLoader = options?.tokenLoader;
+        this.tokenWriter = options?.tokenWriter;
     }
-    /** 从 properties 文件加载 Token */
-    loadToken() {
+    /**
+     * 从 properties 文件（或自定义 tokenLoader）加载 Token。
+     * 若设置了 tokenLoader，优先调用；否则从 properties 文件读取。
+     */
+    async loadToken() {
+        if (this.tokenLoader) {
+            const token = await this.tokenLoader();
+            if (!token) {
+                throw new Error('自定义 tokenLoader 返回空值');
+            }
+            this.token = token;
+            return token;
+        }
+        const content = readFileSync(this.filePath, 'utf-8');
+        const props = parsePropertiesString(content);
+        const token = props['token'];
+        if (!token) {
+            throw new Error('Token 文件中未找到 token 字段');
+        }
+        this.token = token;
+        return token;
+    }
+    /**
+     * 同步版文件加载（仅用于无 tokenLoader 时的兼容入口）。
+     * 建议优先使用 loadToken()（异步）。
+     */
+    loadTokenSync() {
+        if (this.tokenLoader) {
+            throw new Error('tokenLoader 是异步函数，请使用 loadToken()');
+        }
         const content = readFileSync(this.filePath, 'utf-8');
         const props = parsePropertiesString(content);
         const token = props['token'];
@@ -41,10 +72,25 @@ export class TokenManager {
     getToken() {
         return this.token;
     }
-    /** 设置 Token 并更新文件 */
+    /**
+     * 设置 Token；若启用了文件持久化（显式传入 filePath），则同步写文件。
+     * 成功后触发 tokenWriter 回调（如有）。
+     */
     setToken(token) {
         this.token = token;
-        this.saveTokenToFile(token);
+        if (this.fileEnabled) {
+            this.saveTokenToFile(token);
+        }
+        if (this.tokenWriter) {
+            this.tokenWriter(token);
+        }
+    }
+    /**
+     * 仅更新内存中的 token，不写文件，不触发 tokenWriter 回调。
+     * 用于多个组件共享 token 时的内部同步。
+     */
+    syncToken(token) {
+        this.token = token;
     }
     /** 将 Token 保存到 properties 文件 */
     saveTokenToFile(token) {
@@ -101,6 +147,10 @@ export class TokenManager {
                 // 刷新失败时静默跳过
             }
         }, this.refreshInterval);
+        // 防止 timer 阻止 Node.js 进程退出
+        if (this.timer.unref) {
+            this.timer.unref();
+        }
     }
     /** 停止后台刷新 */
     stopAutoRefresh() {

package/dist/esm/index.js

@@ -15,4 +15,18 @@
  * @packageDocumentation
  */
 /** SDK 版本号 */
-export const VERSION = '0.4.0';
+export const VERSION = '0.4.6';
+// Config
+export { createClientConfig, loadPropertiesFile } from './config/index.js';
+export { TokenManager } from './config/index.js';
+// Transport
+export { HttpClient } from './client/index.js';
+export { TigerError, classifyErrorCode } from './client/index.js';
+// Clients
+export { QuoteClient, parseOptionIdentifier } from './quote/index.js';
+export { TradeClient } from './trade/index.js';
+export { PushClient, ConnectionState, SubjectType } from './push/index.js';
+export { marketOrder, limitOrder, stopOrder, stopLimitOrder } from './model/order-helpers.js';
+export { normalizeOrderStatus } from './model/order-status.js';
+// Enums
+export { OrderStatus, SecurityType, OrderType, TimeInForce, Market, Currency, QuoteRight, SegmentType, OrderSortBy, CorporateActionType, IndustryLevel, SortDirection, OptionAnalysisPeriod, FinancialReportPeriod, Language, License, BarPeriod, orderStatusCode, } from './model/enums.js';

package/dist/esm/logger/index.js

@@ -1,4 +1,4 @@
 /**
  * 日志模块导出
  */
-export * from './logger';
+export * from './logger.js';

package/dist/esm/model/contract-helpers.js

@@ -1,4 +1,4 @@
-import { SecurityType } from './enums';
+import { SecurityType } from './enums.js';
 /** 构造股票合约 */
 export function stockContract(symbol, currency) {
     return { symbol, secType: SecurityType.STK, currency };

package/dist/esm/model/enums.js

@@ -47,7 +47,20 @@ export var OrderType;
     OrderType["TWAP"] = "TWAP";
     OrderType["VWAP"] = "VWAP";
     OrderType["OCA"] = "OCA";
+    OrderType["ICEBERG"] = "ICEBERG";
 })(OrderType || (OrderType = {}));
+/** 冰山单价格类型 */
+export var PriceType;
+(function (PriceType) {
+    /** 限价 */
+    PriceType["LIMIT_PRICE"] = "LIMIT_PRICE";
+    /** 卖一价 */
+    PriceType["ASK_PRICE"] = "ASK_PRICE";
+    /** 买一价 */
+    PriceType["BID_PRICE"] = "BID_PRICE";
+    /** 最新价 */
+    PriceType["LATEST_PRICE"] = "LATEST_PRICE";
+})(PriceType || (PriceType = {}));
 /**
  * 订单状态枚举。对齐 Java SDK OrderStatus 定义。
  *

package/dist/esm/model/order-helpers.js

@@ -1,4 +1,4 @@
-import { OrderType, TimeInForce } from './enums';
+import { OrderType, TimeInForce, PriceType } from './enums.js';
 /** Market order */
 export function marketOrder(account, symbol, secType, action, quantity) {
     return {
@@ -87,6 +87,48 @@ export function algoOrder(account, symbol, secType, action, quantity, limitPrice
         outsideRth: false,
     };
 }
+/**
+ * Iceberg order (basic) — only displaySize required.
+ */
+export function icebergOrder(account, symbol, secType, action, quantity, limitPrice, displaySize) {
+    return {
+        account, symbol, secType, action,
+        orderType: OrderType.ICEBERG,
+        totalQuantity: quantity,
+        limitPrice,
+        timeInForce: TimeInForce.DAY,
+        outsideRth: false,
+        displaySize,
+        priceType: PriceType.LIMIT_PRICE,
+    };
+}
+/**
+ * Iceberg order (full params).
+ * Pass `priceType` as empty string to use server default (LIMIT_PRICE).
+ * Pass `startTime` / `endTime` as 0 to omit the time window.
+ */
+export function icebergOrderFull(account, symbol, secType, action, quantity, limitPrice, displaySize, minDisplaySize, checkIntervals, priceType, startTime, endTime) {
+    const req = {
+        account, symbol, secType, action,
+        orderType: OrderType.ICEBERG,
+        totalQuantity: quantity,
+        limitPrice,
+        timeInForce: TimeInForce.DAY,
+        outsideRth: false,
+        displaySize,
+    };
+    if (minDisplaySize !== undefined && minDisplaySize > 0)
+        req.minDisplaySize = minDisplaySize;
+    if (checkIntervals !== undefined && checkIntervals > 0)
+        req.checkIntervals = checkIntervals;
+    if (priceType)
+        req.priceType = priceType;
+    if (startTime && startTime > 0)
+        req.startTime = startTime;
+    if (endTime && endTime > 0)
+        req.endTime = endTime;
+    return req;
+}
 /** Attached profit / loss leg */
 export function orderLeg(legType, price, timeInForce) {
     return { legType, price, timeInForce };

package/dist/esm/model/order-status.js

@@ -7,7 +7,7 @@
  *
  * 对齐 Java SDK OrderStatus.java。
  */
-import { OrderStatus } from './enums';
+import { OrderStatus } from './enums.js';
 /** 把数字状态码映射到字符串,未识别返回空串。 */
 function statusIntToString(n) {
     switch (n) {

package/dist/esm/push/index.js

@@ -1,8 +1,8 @@
 /**
  * Push module exports
  */
-export { SubjectType } from './push-message';
-export * from './callbacks';
-export * from './varint';
-export * from './proto-message';
-export { PushClient, ConnectionState } from './push-client';
+export { SubjectType } from './push-message.js';
+export * from './callbacks.js';
+export * from './varint.js';
+export * from './proto-message.js';
+export { PushClient, ConnectionState } from './push-client.js';

package/dist/esm/push/pb/PushData.js

@@ -5,17 +5,17 @@
 // source: PushData.proto
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-import { AssetData } from "./AssetData";
-import { KlineData } from "./KlineData";
-import { OptionTopData } from "./OptionTopData";
-import { OrderStatusData } from "./OrderStatusData";
-import { OrderTransactionData } from "./OrderTransactionData";
-import { PositionData } from "./PositionData";
-import { QuoteData } from "./QuoteData";
-import { QuoteDepthData } from "./QuoteDepthData";
-import { StockTopData } from "./StockTopData";
-import { TickData } from "./TickData";
-import { TradeTickData } from "./TradeTickData";
+import { AssetData } from "./AssetData.js";
+import { KlineData } from "./KlineData.js";
+import { OptionTopData } from "./OptionTopData.js";
+import { OrderStatusData } from "./OrderStatusData.js";
+import { OrderTransactionData } from "./OrderTransactionData.js";
+import { PositionData } from "./PositionData.js";
+import { QuoteData } from "./QuoteData.js";
+import { QuoteDepthData } from "./QuoteDepthData.js";
+import { StockTopData } from "./StockTopData.js";
+import { TickData } from "./TickData.js";
+import { TradeTickData } from "./TradeTickData.js";
 export const protobufPackage = "com.tigerbrokers.stock.openapi.client.socket.data.pb";
 function createBasePushData() {
     return {

package/dist/esm/push/pb/QuoteBasicData.js

@@ -5,7 +5,7 @@
 // source: QuoteBasicData.proto
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-import { QuoteData_Minute } from "./QuoteData";
+import { QuoteData_Minute } from "./QuoteData.js";
 export const protobufPackage = "com.tigerbrokers.stock.openapi.client.socket.data.pb";
 function createBaseQuoteBasicData() {
     return {

package/dist/esm/push/pb/Response.js

@@ -5,7 +5,7 @@
 // source: Response.proto
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-import { PushData } from "./PushData";
+import { PushData } from "./PushData.js";
 export const protobufPackage = "com.tigerbrokers.stock.openapi.client.socket.data.pb";
 function createBaseResponse() {
     return { command: 0, id: undefined, code: undefined, msg: undefined, body: undefined };

package/dist/esm/push/pb/index.js

@@ -4,22 +4,22 @@
  * 由 ts-proto 从 proto 文件生成的所有类型、枚举和编解码函数
  */
 // 基础层：命令和数据类型枚举
-export { SocketCommon_Command, SocketCommon_DataType, SocketCommon_QuoteType, } from './SocketCommon';
+export { SocketCommon_Command, SocketCommon_DataType, SocketCommon_QuoteType, } from './SocketCommon.js';
 // 协议层：请求和响应消息
-export { Request, Request_Connect, Request_Subscribe } from './Request';
-export { Response } from './Response';
-export { PushData } from './PushData';
+export { Request, Request_Connect, Request_Subscribe } from './Request.js';
+export { Response } from './Response.js';
+export { PushData } from './PushData.js';
 // 数据层：业务数据消息
-export { QuoteData } from './QuoteData';
-export { QuoteBasicData } from './QuoteBasicData';
-export { QuoteBBOData } from './QuoteBBOData';
-export { QuoteDepthData } from './QuoteDepthData';
-export { TradeTickData } from './TradeTickData';
-export { TickData } from './TickData';
-export { AssetData } from './AssetData';
-export { PositionData } from './PositionData';
-export { OrderStatusData } from './OrderStatusData';
-export { OrderTransactionData } from './OrderTransactionData';
-export { StockTopData } from './StockTopData';
-export { OptionTopData } from './OptionTopData';
-export { KlineData } from './KlineData';
+export { QuoteData } from './QuoteData.js';
+export { QuoteBasicData } from './QuoteBasicData.js';
+export { QuoteBBOData } from './QuoteBBOData.js';
+export { QuoteDepthData } from './QuoteDepthData.js';
+export { TradeTickData } from './TradeTickData.js';
+export { TickData } from './TickData.js';
+export { AssetData } from './AssetData.js';
+export { PositionData } from './PositionData.js';
+export { OrderStatusData } from './OrderStatusData.js';
+export { OrderTransactionData } from './OrderTransactionData.js';
+export { StockTopData } from './StockTopData.js';
+export { OptionTopData } from './OptionTopData.js';
+export { KlineData } from './KlineData.js';

package/dist/esm/push/proto-message.js

@@ -4,9 +4,9 @@
  * 对齐 Java SDK 的 ProtoMessageUtil，提供构建各种 Request 消息的工具函数。
  * 所有构建函数共享一个递增的 requestId 计数器。
  */
-import { Request, Request_Connect, Request_Subscribe, } from './pb/Request';
-import { SocketCommon_Command, SocketCommon_DataType, } from './pb/SocketCommon';
-import { SubjectType } from './push-message';
+import { Request, Request_Connect, Request_Subscribe, } from './pb/Request.js';
+import { SocketCommon_Command, SocketCommon_DataType, } from './pb/SocketCommon.js';
+import { SubjectType } from './push-message.js';
 /** 递增请求 ID 计数器（单线程环境，简单递增变量） */
 let requestId = 0;
 /**

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

@@ -9,13 +9,13 @@
  * heartbeat keep-alive, and automatic reconnection.
  */
 import * as tls from 'tls';
-import { signWithRSA } from '../signer/signer';
-import { SubjectType } from './push-message';
-import { Request } from './pb/Request';
-import { Response } from './pb/Response';
-import { SocketCommon_Command, SocketCommon_DataType } from './pb/SocketCommon';
-import { encodeVarint32, decodeVarint32 } from './varint';
-import { buildConnectMessage, buildHeartBeatMessage, buildSubscribeMessage, buildUnSubscribeMessage, buildDisconnectMessage, subjectToDataType, } from './proto-message';
+import { signWithRSA } from '../signer/signer.js';
+import { SubjectType } from './push-message.js';
+import { Request } from './pb/Request.js';
+import { Response } from './pb/Response.js';
+import { SocketCommon_Command, SocketCommon_DataType } from './pb/SocketCommon.js';
+import { encodeVarint32, decodeVarint32 } from './varint.js';
+import { buildConnectMessage, buildHeartBeatMessage, buildSubscribeMessage, buildUnSubscribeMessage, buildDisconnectMessage, subjectToDataType, } from './proto-message.js';
 /** Default push server host */
 const DEFAULT_PUSH_HOST = 'openapi.tigerfintech.com';
 /** Default push server port */
@@ -50,11 +50,13 @@ export class PushClient {
     constructor(config, options) {
         this.socket = null;
         this._state = ConnectionState.Disconnected;
+        /** Whether this connect attempt already fell back to unverified TLS */
+        this.tlsFallback = false;
         this.callbacks = {};
         /** Subscription state: subject -> Set<symbol> */
         this.subscriptions = new Map();
-        /** Account-level subscriptions */
-        this.accountSubs = new Set();
+        /** Account-level subscriptions: subject -> account string used at subscribe time */
+        this.accountSubs = new Map();
         this.heartbeatTimer = null;
         this.reconnectTimer = null;
         this.stopped = false;
@@ -88,6 +90,7 @@ export class PushClient {
             }
             this._state = ConnectionState.Connecting;
             this.stopped = false;
+            this.tlsFallback = false;
             this.recvBuffer = Buffer.alloc(0);
             const socket = this.createSocket(this.pushHost, this.pushPort);
             this.socket = socket;
@@ -144,6 +147,24 @@ export class PushClient {
             });
             socket.on('error', (err) => {
                 if (!settled) {
+                    // If this is a TLS certificate error, warn and retry without verification.
+                    const isTlsCertError = err.message.includes('certificate') ||
+                        err.message.includes('CERT') ||
+                        err.code === 'DEPTH_ZERO_SELF_SIGNED_CERT' ||
+                        err.code === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE' ||
+                        err.code === 'CERT_HAS_EXPIRED';
+                    if (isTlsCertError && !this.tlsFallback) {
+                        this.tlsFallback = true;
+                        settled = true;
+                        clearTimeout(timeout);
+                        socket.destroy();
+                        this.socket = null;
+                        this._state = ConnectionState.Disconnected;
+                        console.warn(`[TigerOpen] TLS certificate verification failed: ${err.message}. Retrying without verification.`);
+                        // Retry immediately using unverified TLS
+                        this.connect().then(resolve).catch(reject);
+                        return;
+                    }
                     settled = true;
                     clearTimeout(timeout);
                     this._state = ConnectionState.Disconnected;
@@ -196,7 +217,7 @@ export class PushClient {
     createSocket(host, port) {
         if (this.socketFactory)
             return this.socketFactory(host, port);
-        return tls.connect({ host, port, rejectUnauthorized: false });
+        return tls.connect({ host, port, rejectUnauthorized: !this.tlsFallback });
     }
     /** Handle incoming TCP data: buffer + decode varint32 frames */
     handleData(chunk, onConnected) {
@@ -295,8 +316,8 @@ export class PushClient {
         for (const [subject, symbols] of this.subscriptions) {
             this.doSubscribe(subject, Array.from(symbols));
         }
-        for (const subject of this.accountSubs) {
-            this.doSubscribe(subject, undefined, this.config.account);
+        for (const [subject, account] of this.accountSubs) {
+            this.doSubscribe(subject, undefined, account);
         }
     }
     /** Dispatch push data to the appropriate callback based on dataType */
@@ -530,8 +551,9 @@ export class PushClient {
     // ===== Account push subscribe/unsubscribe =====
     /** Subscribe to asset changes */
     subscribeAsset(account) {
-        this.doSubscribe(SubjectType.Asset, undefined, account || this.config.account);
-        this.accountSubs.add(SubjectType.Asset);
+        const acct = account || this.config.account;
+        this.doSubscribe(SubjectType.Asset, undefined, acct);
+        this.accountSubs.set(SubjectType.Asset, acct);
     }
     /** Unsubscribe from asset changes */
     unsubscribeAsset() {
@@ -540,8 +562,9 @@ export class PushClient {
     }
     /** Subscribe to position changes */
     subscribePosition(account) {
-        this.doSubscribe(SubjectType.Position, undefined, account || this.config.account);
-        this.accountSubs.add(SubjectType.Position);
+        const acct = account || this.config.account;
+        this.doSubscribe(SubjectType.Position, undefined, acct);
+        this.accountSubs.set(SubjectType.Position, acct);
     }
     /** Unsubscribe from position changes */
     unsubscribePosition() {
@@ -550,8 +573,9 @@ export class PushClient {
     }
     /** Subscribe to order status */
     subscribeOrder(account) {
-        this.doSubscribe(SubjectType.Order, undefined, account || this.config.account);
-        this.accountSubs.add(SubjectType.Order);
+        const acct = account || this.config.account;
+        this.doSubscribe(SubjectType.Order, undefined, acct);
+        this.accountSubs.set(SubjectType.Order, acct);
     }
     /** Unsubscribe from order status */
     unsubscribeOrder() {
@@ -560,8 +584,9 @@ export class PushClient {
     }
     /** Subscribe to transaction details */
     subscribeTransaction(account) {
-        this.doSubscribe(SubjectType.Transaction, undefined, account || this.config.account);
-        this.accountSubs.add(SubjectType.Transaction);
+        const acct = account || this.config.account;
+        this.doSubscribe(SubjectType.Transaction, undefined, acct);
+        this.accountSubs.set(SubjectType.Transaction, acct);
     }
     /** Unsubscribe from transaction details */
     unsubscribeTransaction() {
@@ -577,8 +602,8 @@ export class PushClient {
         }
         return result;
     }
-    /** Get account-level subscriptions */
+    /** Get account-level subscriptions: subject -> account */
     getAccountSubscriptions() {
-        return Array.from(this.accountSubs);
+        return new Map(this.accountSubs);
     }
 }

package/dist/esm/quote/index.js

@@ -1,4 +1,4 @@
 /**
  * Quote module exports
  */
-export { QuoteClient, parseOptionIdentifier } from './quote-client';
+export { QuoteClient, parseOptionIdentifier } from './quote-client.js';