@nightlylabs/dex-sdk 0.3.36 → 0.3.37

package/dist/index.cjs

@@ -23934,13 +23934,15 @@ var AccountSequenceNumber = class {
 // src/client.ts
 var getRandomId = () => (0, import_uuid.v7)();
 var Client = class _Client {
-  constructor(connection, enableWs, url, apiKey, chainId, params, networkMode = "testnet") {
+  constructor(connection, enableWs, url, apiKey, chainId, params, networkMode = "testnet", wsDebug = false, timeout = 5e3) {
     this._apiKeySequenceNumber = 0;
     this._subscriptions = /* @__PURE__ */ new Map();
     this._gasUnitPrice = 100;
     this._expirationTimestampDelay = 20;
     // 20 seconds
     this.timeout = 5e3;
+    // Same as below in init
+    this.wsDebug = false;
     /////////////////////////////////// Sponsored transactions
     this.submitSponsoredTransaction = async (tx, signature) => {
       const payload = {
@@ -24091,24 +24093,11 @@ var Client = class _Client {
       const response = await this.sendGetJson("/v1/get_borrow_lending_data" /* GetBorrowLendingData */);
       return response;
     };
-    this.getChartCandlesInRange = async ({
-      interval,
-      marketName,
-      timestampStartMs = Math.round((/* @__PURE__ */ new Date()).getTime()),
-      timestampEndMs = Math.round((/* @__PURE__ */ new Date()).getTime() - 24 * 60 * 60 * 1e3),
-      // default 24 back
-      cursor
-    }) => {
-      if (timestampEndMs && timestampStartMs && timestampEndMs > timestampStartMs) {
-        throw new Error("timestampEndMs must be lower than timestampStartMs");
+    this.getChartCandlesInRange = async (request) => {
+      if (request.olderTimestampMs && request.newerTimestampMs && request.olderTimestampMs > request.newerTimestampMs) {
+        throw new Error("olderTimestampMs must be lower than newerTimestampMs");
       }
-      const response = await this.sendGetJson("/v1/public/chart_candles_in_range" /* GetChartCandlesInRange */, {
-        marketName,
-        interval,
-        startTimestamp: timestampStartMs.toString(),
-        endTimestamp: timestampEndMs.toString(),
-        paginationCursor: cursor
-      });
+      const response = await this.sendGetJson("/v1/public/chart_candles_in_range" /* GetChartCandlesInRange */, request);
       return response;
     };
     this.getPriceIndexes = async () => {
@@ -24403,13 +24392,25 @@ var Client = class _Client {
     this._maxGas = params?.maxGas || 2e4;
     this._gasUnitPrice = params?.gasUnitPrice || 100;
     this._expirationTimestampDelay = params?.expirationTimestampSecs || 20;
+    this.wsDebug = wsDebug;
+    this.timeout = timeout;
     if (enableWs) {
       this.connectWebSocket();
     }
   }
-  static async init(connection, enableWs = true, url, apiKey, chainId, params, networkMode = "testnet") {
+  static async init(connection, enableWs = true, url, apiKey, chainId, params, networkMode = "testnet", wsDebug = false, timeout = 5e3) {
     const id = chainId || await connection.getChainId();
-    const client = new _Client(connection, enableWs, url, apiKey, id, params, networkMode);
+    const client = new _Client(
+      connection,
+      enableWs,
+      url,
+      apiKey,
+      id,
+      params,
+      networkMode,
+      wsDebug,
+      timeout
+    );
     if (enableWs) {
       client.connectWebSocket();
     }
@@ -24443,11 +24444,21 @@ var Client = class _Client {
    *   myApiKeyAccount  // custom API key
    * )
    */
-  static async create(connection, networkMode = "testnet", enableWs = true, url, apiKey) {
+  static async create(connection, networkMode = "testnet", enableWs = true, url, apiKey, wsDebug = false, timeout = 5e3) {
     const networkConfig = getNetworkConfig(networkMode);
     const apiUrl = url || networkConfig.apiUrl;
     const chainId = networkConfig.chainId;
-    return _Client.init(connection, enableWs, apiUrl, apiKey, chainId, void 0, networkMode);
+    return _Client.init(
+      connection,
+      enableWs,
+      apiUrl,
+      apiKey,
+      chainId,
+      void 0,
+      networkMode,
+      wsDebug,
+      timeout
+    );
   }
   async setApiKey(apiKey) {
     this._apiKey = apiKey;
@@ -24473,21 +24484,60 @@ var Client = class _Client {
     this._expirationTimestampDelay = params.expirationTimestampSecs;
   }
   //////////////////////////////////////// Websocket functions
+  _wsLog(...args) {
+    if (this.wsDebug) console.log("[WS]", ...args);
+  }
+  setWsDebugActive(active) {
+    this.wsDebug = active;
+  }
   async connectWebSocket() {
     if (this._ws) {
       console.warn("WebSocket is already connected");
       return;
     }
     try {
-      this._ws = await _Client.initWebSocket(this._serverUrl, this.timeout);
+      const wsUrl = `${this._serverUrl.replace("http", "ws").replace("https", "wss")}` + "/v1/ws" /* Ws */;
+      this._wsLog("Connecting to", wsUrl);
+      this._ws = new WebSocket(wsUrl);
       this._setupWebSocketHandlers();
-      return;
+      await this._waitForOpen(this.timeout);
+      this._wsLog("Connected");
     } catch (error) {
+      this._wsLog("Connection failed:", error);
+      this._ws = void 0;
       throw new Error(`Failed to connect WebSocket: ${error}`);
     }
   }
+  _waitForOpen(timeout) {
+    return new Promise((resolve, reject) => {
+      if (!this._ws) return reject(new Error("No WebSocket"));
+      if (this._ws.readyState === WebSocket.OPEN) {
+        return resolve();
+      }
+      const timer = setTimeout(() => {
+        this._wsLog("Connection timeout after", timeout, "ms");
+        reject(new Error("WebSocket connection timeout"));
+      }, timeout);
+      const ws = this._ws;
+      const origOnOpen = ws.onopen;
+      ws.onopen = (event) => {
+        clearTimeout(timer);
+        origOnOpen?.call(ws, event);
+        resolve();
+      };
+      const origOnError = ws.onerror;
+      ws.onerror = (error) => {
+        clearTimeout(timer);
+        origOnError?.call(ws, error);
+        reject(error);
+      };
+    });
+  }
   _setupWebSocketHandlers() {
     if (!this._ws) return;
+    this._ws.onopen = () => {
+      this._wsLog("Opened");
+    };
     this._ws.onmessage = async (msg) => {
       let data;
       if (msg.data.arrayBuffer) {
@@ -24496,49 +24546,52 @@ var Client = class _Client {
         data = msg.data;
       }
       const decodedMsg = JSON.parse(data);
+      this._wsLog("Received:", decodedMsg.type, decodedMsg.content);
       const topic = getTopicFromMessage(decodedMsg);
       const callback = this._subscriptions.get(topic);
       if (callback) {
         callback(decodedMsg);
+      } else {
+        this._wsLog("No handler for topic:", topic);
       }
     };
-  }
-  static async initWebSocket(url, timeout = 5e3) {
-    return new Promise((resolve, reject) => {
-      const ws = new WebSocket(
-        `${url.replace("http", "ws").replace("https", "wss")}` + "/v1/ws" /* Ws */
+    this._ws.onclose = (event) => {
+      this._wsLog(
+        "Closed: code=" + event.code,
+        "reason=" + event.reason,
+        "clean=" + event.wasClean
       );
-      const timer = setTimeout(() => {
-        reject(new Error("WebSocket connection timeout"));
-      }, timeout);
-      ws.onopen = () => {
-        clearTimeout(timer);
-        resolve(ws);
-      };
-      ws.onerror = (error) => {
-        clearTimeout(timer);
-        reject(error);
-      };
-    });
+      this._ws = void 0;
+      this._subscriptions.clear();
+      this.onWsClose?.(event);
+    };
+    this._ws.onerror = (error) => {
+      this._wsLog("Error:", error);
+    };
   }
   async disconnectWebSocket() {
     if (!this._ws) {
       console.warn("WebSocket is not connected");
       return;
     }
+    this._wsLog("Disconnecting, clearing", this._subscriptions.size, "subscriptions");
     this._subscriptions.clear();
     this._ws.close();
     this._ws = void 0;
   }
   // Method to check if WebSocket is connected
   isWebSocketConnected() {
-    return this._ws !== void 0 && this._ws.readyState === WebSocket.OPEN;
+    const connected = this._ws !== void 0 && this._ws.readyState === WebSocket.OPEN;
+    this._wsLog("isWebSocketConnected:", connected);
+    return connected;
   }
   sendWsMessage(message) {
     if (!this._ws) throw new Error("WebSocket is not connected");
     return new Promise((resolve, reject) => {
       const topic = message.content.id;
+      this._wsLog("Sending:", message.type, "id=" + topic);
       const timer = setTimeout(() => {
+        this._wsLog("Timeout waiting for response:", message.type, "id=" + topic);
         reject(new Error(`Connection timed out after ${this.timeout} ms`));
       }, this.timeout);
       let handler = (response) => {
@@ -24546,11 +24599,13 @@ var Client = class _Client {
         this._subscriptions.delete(topic);
         if (response.type === "Error") {
           const errorMessage = response.content.message || "Unknown websocket error without message";
+          this._wsLog("Error response:", errorMessage, "id=" + topic);
           reject(
             new Error(`WebSocket error (id: ${response.content.id}): ${errorMessage}`)
           );
           return;
         }
+        this._wsLog("Ack received for:", message.type, "id=" + topic);
         resolve(response);
       };
       this._subscriptions.set(topic, handler);

package/dist/index.d.cts

@@ -5597,13 +5597,6 @@ interface WithdrawTokenParams {
     max: boolean;
     recipient: Address;
 }
-interface IGetChartCandlesInRange {
-    marketName: string;
-    interval: ChartInterval;
-    timestampStartMs?: number;
-    timestampEndMs?: number;
-    cursor?: PaginationCursor;
-}
 interface PlaceMultiplePerpOrdersParams {
     userId: string;
     perpOrders: PerpOrderData[];
@@ -5781,10 +5774,12 @@ declare class Client {
     _gasUnitPrice: number;
     _expirationTimestampDelay: number;
     timeout: number;
+    wsDebug: boolean;
+    onWsClose: ((event: CloseEvent) => void) | undefined;
     _abis: ReturnType<typeof getABIsForNetwork>;
     _contractAddress: string;
-    static init(connection: Aptos, enableWs?: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode): Promise<Client>;
-    constructor(connection: Aptos, enableWs: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode);
+    static init(connection: Aptos, enableWs?: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode, wsDebug?: boolean, timeout?: number): Promise<Client>;
+    constructor(connection: Aptos, enableWs: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode, wsDebug?: boolean, timeout?: number);
     /**
      * Create a new Client instance
      *
@@ -5813,15 +5808,17 @@ declare class Client {
      *   myApiKeyAccount  // custom API key
      * )
      */
-    static create(connection: Aptos, networkMode?: NetworkMode, enableWs?: boolean, url?: string, apiKey?: Account): Promise<Client>;
+    static create(connection: Aptos, networkMode?: NetworkMode, enableWs?: boolean, url?: string, apiKey?: Account, wsDebug?: boolean, timeout?: number): Promise<Client>;
     setApiKey(apiKey: Account): Promise<void>;
     getContractAddress(): string;
     getApiKeySequenceNumber(): Promise<bigint | null>;
     fetchApiKeySequenceNumber(): Promise<number>;
     setTxParams(params: TxParams): void;
+    private _wsLog;
+    setWsDebugActive(active: boolean): void;
     connectWebSocket(): Promise<void>;
+    private _waitForOpen;
     private _setupWebSocketHandlers;
-    static initWebSocket(url: string, timeout?: number): Promise<WebSocket>;
     disconnectWebSocket(): Promise<void>;
     isWebSocketConnected(): boolean;
     sendWsMessage(message: WsCommand): Promise<WsMessage>;
@@ -5901,7 +5898,7 @@ declare class Client {
     getPerpMarketsData: (markets: string[]) => Promise<GetPerpMarketsDataResponse>;
     getSpotMarketsData: (markets: string[]) => Promise<GetSpotMarketsDataResponse>;
     getBorrowLendingData: () => Promise<GetBorrowLendingDataResponse>;
-    getChartCandlesInRange: ({ interval, marketName, timestampStartMs, timestampEndMs, cursor, }: IGetChartCandlesInRange) => Promise<GetChartCandlesInRangeResponse>;
+    getChartCandlesInRange: (request: GetChartCandlesInRangeRequest) => Promise<GetChartCandlesInRangeResponse>;
     getPriceIndexes: () => Promise<GetPriceIndexesResponse>;
     getUsersByAddress: (payload: GetUsersByAddressRequest) => Promise<GetUsersByAddressResponse>;
     getPerpRecentTrades: (request: GetPerpRecentTradesRequest) => Promise<GetPerpRecentTradesResponse>;
@@ -5980,4 +5977,4 @@ declare const generateApiKey: () => _aptos_labs_ts_sdk.Ed25519Account;
 declare const getTopicFromCommand: (data: WsCommand) => string;
 declare const getTopicFromMessage: (data: WsMessage) => string;
 
-export { ABIs, type AccountValueRankingEntry, type AddApiCreditsParams, type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type ApiCreditsChange, type ApiStatus, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLendUpdate, type BorrowLending, type BorrowLendingAggregatedData, type BorrowLendingHistoricalData, type BoxOpeningEvent, type BoxReward, BoxRewardTier, type CancelAllPerpOrdersParams, type CancelAllSpotOrdersParams, type CancelPerpOrdersParams, type CancelSpotOrdersParams, type CanceledPerpOrderData, type CanceledPerpOrders, type CanceledPerpTriggerOrderData, type CanceledPerpTriggerOrders, type CanceledSpotOrderData, type CanceledSpotOrders, type ChangePerpOrderParams, type ChangeSpotOrderParams, type ChartCandle, ChartInterval, type CheckReferralCodeRequest, type CheckReferralCodeResponse, type ClaimDepositParams, type ClaimKickbackFeeParams, type ClaimReferralFee, type ClaimReferralFeesParams, type ClaimUserKickbackFee, type ClaimedKickback, type ClaimedReferralKickback, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type ExchangeStatsEntry, type FeeData, type FeeTier, type Fees, type FundingCheckpoint, type FundingPayment, type FundingRate, GLOBAL_DENOMINATOR, type GetAccountValueRankingRequest, type GetAccountValueRankingResponse, type GetAllVaultsIdsResponse, type GetBorrowLendingAggregatedStatsRequest, type GetBorrowLendingAggregatedStatsResponse, type GetBorrowLendingDataResponse, type GetBorrowLendingHistoricalDataRequest, type GetBorrowLendingHistoricalDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetExchangeStatsHistoryRequest, type GetExchangeStatsHistoryResponse, type GetIndexPriceHistoryRequest, type GetIndexPriceHistoryResponse, type GetIndexPricesResponse, type GetIndexerStatusResponse, type GetOrderBookDataRequest, type GetOrderBookDataResponse, type GetPerpMarketsConfigResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpUserTriggerOrdersRequest, type GetPerpUserTriggerOrdersResponse, type GetPriceIndexesResponse, type GetServicesStatusResponse, type GetSpotMarketsConfigResponse, type GetSpotMarketsDataRequest, type GetSpotMarketsDataResponse, type GetSpotRecentTradesRequest, type GetSpotRecentTradesResponse, type GetSpotUserFillsRequest, type GetSpotUserFillsResponse, type GetSpotUserOrdersRequest, type GetSpotUserOrdersResponse, type GetTokenAggregatedStatsRequest, type GetTokenAggregatedStatsResponse, type GetTokenStatsHistoryRequest, type GetTokenStatsHistoryResponse, type GetTokensConfigResponse, type GetTopPointsRankingResponse, type GetUserAccountValueRankingRequest, type GetUserAccountValueRankingResponse, type GetUserAggregatedBoxRewardsStatsRequest, type GetUserAggregatedBoxRewardsStatsResponse, type GetUserAggregatedReferralStatsRequest, type GetUserAggregatedReferralStatsResponse, type GetUserAggregatedStatsRequest, type GetUserAggregatedStatsResponse, type GetUserAggregatedVaultStatsRequest, type GetUserAggregatedVaultStatsResponse, type GetUserBoxRewardsStatsHistoryRequest, type GetUserBoxRewardsStatsHistoryResponse, type GetUserBoxesHistoryRequest, type GetUserBoxesHistoryResponse, type GetUserClaimedKickbackHistoryRequest, type GetUserClaimedKickbackHistoryResponse, type GetUserClaimedReferralKickbackHistoryRequest, type GetUserClaimedReferralKickbackHistoryResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUserDepositsRequest, type GetUserDepositsResponse, type GetUserFullLiquidationsHistoryRequest, type GetUserFundingHistoryRequest, type GetUserFundingHistoryResponse, type GetUserLiquidationsCancelHistoryResponse, type GetUserLiquidationsCancelOrdersHistoryRequest, type GetUserLiquidationsHistoryResponse, type GetUserPartialLiquidationsHistoryRequest, type GetUserPartialLiquidationsHistoryResponse, type GetUserPersonalPointsRankingRequest, type GetUserPersonalPointsRankingResponse, type GetUserPointsHistoryRequest, type GetUserPointsHistoryResponse, type GetUserPortfolioValueRequest, type GetUserPortfolioValueResponse, type GetUserReferralStatsHistoryRequest, type GetUserReferralStatsHistoryResponse, type GetUserRewardsValueRequest, type GetUserRewardsValueResponse, type GetUserTradeStatsHistoryRequest, type GetUserTradeStatsHistoryResponse, type GetUserTransferHistoryRequest, type GetUserTransferHistoryResponse, type GetUserVaultDepositsRequest, type GetUserVaultDepositsResponse, type GetUserVaultWithdrawsRequest, type GetUserVaultWithdrawsResponse, type GetUserVolumeForReferralRequest, type GetUserVolumeForReferralResponse, type GetUserWithdrawalsRequest, type GetUserWithdrawalsResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type GetVaultDepositsRequest, type GetVaultDepositsResponse, type GetVaultHistoricalDataRequest, type GetVaultHistoricalDataResponse, type GetVaultWithdrawalsRequest, type GetVaultWithdrawalsResponse, type GlobalLiquidation, type GlobalPartialLiquidation, type HistoricBoxReward, type HistoricalBoxRewardsStats, type HistoricalDeposit, type HistoricalFullLiquidation, type HistoricalFunding, type HistoricalLiquidatedBorrow, type HistoricalLiquidatedCollateral, type HistoricalLiquidatedLend, type HistoricalLiquidatedPosition, type HistoricalLiquidationCancelOrders, type HistoricalPartialLiquidatedPosition, type HistoricalPartialLiquidation, type HistoricalPerpOrder, type HistoricalPoints, type HistoricalReferralStats, type HistoricalSpotOrder, type HistoricalTokenStats, type HistoricalTradeStats, type HistoricalUserTransfer, type HistoricalVaultDeposit, type HistoricalVaultWithdraw, type HistoricalWithdraw, type IGetChartCandlesInRange, type IndexPriceHistory, type IndexPriceLive, type Lend, type LendTokenParams, type Liquidation, type LiquidationCancelledOrderData, type LiquidationCancelledTriggerOrderData, MAINNET_CONFIG, type MarginStep, Network, type NetworkConfig, type NetworkMode, type NodeStatus, type OpenBoxesRequest, type OpenBoxesResponse, type OpenBoxesSignRequest, type OracleUpdate, type OracleUpdates, type OrderBookData, OrderSide, OrderStatus, OrderType, type PaginationCursor, type PartialLiquidation, type PerpFill, type PerpMarketConfigEntry, type PerpMarketData, type PerpOrder, type PerpOrderData, type PerpOrderDataForMarket, type PerpOrderFills, type PerpOrderbookState, type PerpOrderbookUpdate, type PerpPosition, type PerpTrade, type PerpTradesUpdate, type PerpTriggerOrder, type PerpTriggerOrderTriggered, type PlaceMultiplePerpOrdersParams, type PlaceMultipleSpotOrdersParams, type PlacePerpLimitOrder, type PlacePerpMarketOrder, type PlacePerpOrderParams, type PlacePerpTriggerOrder, type PlacePerpTriggerOrderParams, type PlaceSpotLimitOrder, type PlaceSpotMarketOrder, type PlaceSpotOrderParams, type PointsRankingEntry, type PriceIndex, type RedeemTokenParams, type Referral, type ReferralUpdate, type RemoveApiKey, type RemoveApiKeyParams, type RemoveApiKeySignerParams, type RepayBorrow, type ReplaceMultipleOrdersParams, type ReplaceMultipleSpotOrdersParams, type SetAlias, type SetAliasNameParams, type SetAutoLend, type SetAutolendParams, type SetReferralCodeParams, type SetReferralParamsRequest, type SetReferralParamsResponse, type SpotFill, type SpotMarketConfigEntry, type SpotMarketData, type SpotOrder, type SpotOrderData, type SpotOrderDataForMarket, type SpotOrderFills, type SpotOrderbookState, type SpotOrderbookUpdate, type SpotTrade, type SpotTradesUpdate, Status, type StatusResponse, type SubServiceStatus, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TESTNET_CONFIG, TestFaucet, type TimeResponse, type TokenAggregatedStats, type TokenConfigEntry, type TokenizeUserVaultInvestmentParams, type Topic, type Trade, TradeRole, TransferAction, type TransferToUserParams, type TriggerOrder, type TvlTokenEntry, type TxParams, type UpdateUserFeeTier, type User, type UserAggregatedBoxRewardsStats, type UserAggregatedReferralStats, type UserAggregatedStats, type UserAggregatedVaultStats, type UserBoxOpeningEvent, type UserPointsBreakdown, type UserPortfolioValue, type UserRewardsValue, UserStatus, type UserTransfer, type UtilizationCurve, type Vault, type VaultDeposit, type VaultHistoricalData, type VaultInvestment, type VaultWithdraw, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WithdrawTokenParams, type WsBorrowLendUpdate, type WsBoxOpeningUpdate, type WsCommand, type WsFill, type WsLiquidatedBorrow, type WsLiquidatedCollateral, type WsLiquidatedLend, type WsLiquidatedPosition, type WsLiquidationUpdate, type WsMessage, type WsOracleUpdates, type WsPartialLiquidatedPosition, type WsPerpMarketUpdates, type WsSpotMarketUpdates, type WsUserUpdates, createAptosClient, createAptosClientFromEnv, generateApiKey, getABIsForNetwork, getNetworkConfig, getNetworkModeFromEnv, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };
+export { ABIs, type AccountValueRankingEntry, type AddApiCreditsParams, type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type ApiCreditsChange, type ApiStatus, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLendUpdate, type BorrowLending, type BorrowLendingAggregatedData, type BorrowLendingHistoricalData, type BoxOpeningEvent, type BoxReward, BoxRewardTier, type CancelAllPerpOrdersParams, type CancelAllSpotOrdersParams, type CancelPerpOrdersParams, type CancelSpotOrdersParams, type CanceledPerpOrderData, type CanceledPerpOrders, type CanceledPerpTriggerOrderData, type CanceledPerpTriggerOrders, type CanceledSpotOrderData, type CanceledSpotOrders, type ChangePerpOrderParams, type ChangeSpotOrderParams, type ChartCandle, ChartInterval, type CheckReferralCodeRequest, type CheckReferralCodeResponse, type ClaimDepositParams, type ClaimKickbackFeeParams, type ClaimReferralFee, type ClaimReferralFeesParams, type ClaimUserKickbackFee, type ClaimedKickback, type ClaimedReferralKickback, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type ExchangeStatsEntry, type FeeData, type FeeTier, type Fees, type FundingCheckpoint, type FundingPayment, type FundingRate, GLOBAL_DENOMINATOR, type GetAccountValueRankingRequest, type GetAccountValueRankingResponse, type GetAllVaultsIdsResponse, type GetBorrowLendingAggregatedStatsRequest, type GetBorrowLendingAggregatedStatsResponse, type GetBorrowLendingDataResponse, type GetBorrowLendingHistoricalDataRequest, type GetBorrowLendingHistoricalDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetExchangeStatsHistoryRequest, type GetExchangeStatsHistoryResponse, type GetIndexPriceHistoryRequest, type GetIndexPriceHistoryResponse, type GetIndexPricesResponse, type GetIndexerStatusResponse, type GetOrderBookDataRequest, type GetOrderBookDataResponse, type GetPerpMarketsConfigResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpUserTriggerOrdersRequest, type GetPerpUserTriggerOrdersResponse, type GetPriceIndexesResponse, type GetServicesStatusResponse, type GetSpotMarketsConfigResponse, type GetSpotMarketsDataRequest, type GetSpotMarketsDataResponse, type GetSpotRecentTradesRequest, type GetSpotRecentTradesResponse, type GetSpotUserFillsRequest, type GetSpotUserFillsResponse, type GetSpotUserOrdersRequest, type GetSpotUserOrdersResponse, type GetTokenAggregatedStatsRequest, type GetTokenAggregatedStatsResponse, type GetTokenStatsHistoryRequest, type GetTokenStatsHistoryResponse, type GetTokensConfigResponse, type GetTopPointsRankingResponse, type GetUserAccountValueRankingRequest, type GetUserAccountValueRankingResponse, type GetUserAggregatedBoxRewardsStatsRequest, type GetUserAggregatedBoxRewardsStatsResponse, type GetUserAggregatedReferralStatsRequest, type GetUserAggregatedReferralStatsResponse, type GetUserAggregatedStatsRequest, type GetUserAggregatedStatsResponse, type GetUserAggregatedVaultStatsRequest, type GetUserAggregatedVaultStatsResponse, type GetUserBoxRewardsStatsHistoryRequest, type GetUserBoxRewardsStatsHistoryResponse, type GetUserBoxesHistoryRequest, type GetUserBoxesHistoryResponse, type GetUserClaimedKickbackHistoryRequest, type GetUserClaimedKickbackHistoryResponse, type GetUserClaimedReferralKickbackHistoryRequest, type GetUserClaimedReferralKickbackHistoryResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUserDepositsRequest, type GetUserDepositsResponse, type GetUserFullLiquidationsHistoryRequest, type GetUserFundingHistoryRequest, type GetUserFundingHistoryResponse, type GetUserLiquidationsCancelHistoryResponse, type GetUserLiquidationsCancelOrdersHistoryRequest, type GetUserLiquidationsHistoryResponse, type GetUserPartialLiquidationsHistoryRequest, type GetUserPartialLiquidationsHistoryResponse, type GetUserPersonalPointsRankingRequest, type GetUserPersonalPointsRankingResponse, type GetUserPointsHistoryRequest, type GetUserPointsHistoryResponse, type GetUserPortfolioValueRequest, type GetUserPortfolioValueResponse, type GetUserReferralStatsHistoryRequest, type GetUserReferralStatsHistoryResponse, type GetUserRewardsValueRequest, type GetUserRewardsValueResponse, type GetUserTradeStatsHistoryRequest, type GetUserTradeStatsHistoryResponse, type GetUserTransferHistoryRequest, type GetUserTransferHistoryResponse, type GetUserVaultDepositsRequest, type GetUserVaultDepositsResponse, type GetUserVaultWithdrawsRequest, type GetUserVaultWithdrawsResponse, type GetUserVolumeForReferralRequest, type GetUserVolumeForReferralResponse, type GetUserWithdrawalsRequest, type GetUserWithdrawalsResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type GetVaultDepositsRequest, type GetVaultDepositsResponse, type GetVaultHistoricalDataRequest, type GetVaultHistoricalDataResponse, type GetVaultWithdrawalsRequest, type GetVaultWithdrawalsResponse, type GlobalLiquidation, type GlobalPartialLiquidation, type HistoricBoxReward, type HistoricalBoxRewardsStats, type HistoricalDeposit, type HistoricalFullLiquidation, type HistoricalFunding, type HistoricalLiquidatedBorrow, type HistoricalLiquidatedCollateral, type HistoricalLiquidatedLend, type HistoricalLiquidatedPosition, type HistoricalLiquidationCancelOrders, type HistoricalPartialLiquidatedPosition, type HistoricalPartialLiquidation, type HistoricalPerpOrder, type HistoricalPoints, type HistoricalReferralStats, type HistoricalSpotOrder, type HistoricalTokenStats, type HistoricalTradeStats, type HistoricalUserTransfer, type HistoricalVaultDeposit, type HistoricalVaultWithdraw, type HistoricalWithdraw, type IndexPriceHistory, type IndexPriceLive, type Lend, type LendTokenParams, type Liquidation, type LiquidationCancelledOrderData, type LiquidationCancelledTriggerOrderData, MAINNET_CONFIG, type MarginStep, Network, type NetworkConfig, type NetworkMode, type NodeStatus, type OpenBoxesRequest, type OpenBoxesResponse, type OpenBoxesSignRequest, type OracleUpdate, type OracleUpdates, type OrderBookData, OrderSide, OrderStatus, OrderType, type PaginationCursor, type PartialLiquidation, type PerpFill, type PerpMarketConfigEntry, type PerpMarketData, type PerpOrder, type PerpOrderData, type PerpOrderDataForMarket, type PerpOrderFills, type PerpOrderbookState, type PerpOrderbookUpdate, type PerpPosition, type PerpTrade, type PerpTradesUpdate, type PerpTriggerOrder, type PerpTriggerOrderTriggered, type PlaceMultiplePerpOrdersParams, type PlaceMultipleSpotOrdersParams, type PlacePerpLimitOrder, type PlacePerpMarketOrder, type PlacePerpOrderParams, type PlacePerpTriggerOrder, type PlacePerpTriggerOrderParams, type PlaceSpotLimitOrder, type PlaceSpotMarketOrder, type PlaceSpotOrderParams, type PointsRankingEntry, type PriceIndex, type RedeemTokenParams, type Referral, type ReferralUpdate, type RemoveApiKey, type RemoveApiKeyParams, type RemoveApiKeySignerParams, type RepayBorrow, type ReplaceMultipleOrdersParams, type ReplaceMultipleSpotOrdersParams, type SetAlias, type SetAliasNameParams, type SetAutoLend, type SetAutolendParams, type SetReferralCodeParams, type SetReferralParamsRequest, type SetReferralParamsResponse, type SpotFill, type SpotMarketConfigEntry, type SpotMarketData, type SpotOrder, type SpotOrderData, type SpotOrderDataForMarket, type SpotOrderFills, type SpotOrderbookState, type SpotOrderbookUpdate, type SpotTrade, type SpotTradesUpdate, Status, type StatusResponse, type SubServiceStatus, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TESTNET_CONFIG, TestFaucet, type TimeResponse, type TokenAggregatedStats, type TokenConfigEntry, type TokenizeUserVaultInvestmentParams, type Topic, type Trade, TradeRole, TransferAction, type TransferToUserParams, type TriggerOrder, type TvlTokenEntry, type TxParams, type UpdateUserFeeTier, type User, type UserAggregatedBoxRewardsStats, type UserAggregatedReferralStats, type UserAggregatedStats, type UserAggregatedVaultStats, type UserBoxOpeningEvent, type UserPointsBreakdown, type UserPortfolioValue, type UserRewardsValue, UserStatus, type UserTransfer, type UtilizationCurve, type Vault, type VaultDeposit, type VaultHistoricalData, type VaultInvestment, type VaultWithdraw, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WithdrawTokenParams, type WsBorrowLendUpdate, type WsBoxOpeningUpdate, type WsCommand, type WsFill, type WsLiquidatedBorrow, type WsLiquidatedCollateral, type WsLiquidatedLend, type WsLiquidatedPosition, type WsLiquidationUpdate, type WsMessage, type WsOracleUpdates, type WsPartialLiquidatedPosition, type WsPerpMarketUpdates, type WsSpotMarketUpdates, type WsUserUpdates, createAptosClient, createAptosClientFromEnv, generateApiKey, getABIsForNetwork, getNetworkConfig, getNetworkModeFromEnv, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };

package/dist/index.d.ts

@@ -5597,13 +5597,6 @@ interface WithdrawTokenParams {
     max: boolean;
     recipient: Address;
 }
-interface IGetChartCandlesInRange {
-    marketName: string;
-    interval: ChartInterval;
-    timestampStartMs?: number;
-    timestampEndMs?: number;
-    cursor?: PaginationCursor;
-}
 interface PlaceMultiplePerpOrdersParams {
     userId: string;
     perpOrders: PerpOrderData[];
@@ -5781,10 +5774,12 @@ declare class Client {
     _gasUnitPrice: number;
     _expirationTimestampDelay: number;
     timeout: number;
+    wsDebug: boolean;
+    onWsClose: ((event: CloseEvent) => void) | undefined;
     _abis: ReturnType<typeof getABIsForNetwork>;
     _contractAddress: string;
-    static init(connection: Aptos, enableWs?: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode): Promise<Client>;
-    constructor(connection: Aptos, enableWs: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode);
+    static init(connection: Aptos, enableWs?: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode, wsDebug?: boolean, timeout?: number): Promise<Client>;
+    constructor(connection: Aptos, enableWs: boolean, url?: string, apiKey?: Account, chainId?: number, params?: TxParams, networkMode?: NetworkMode, wsDebug?: boolean, timeout?: number);
     /**
      * Create a new Client instance
      *
@@ -5813,15 +5808,17 @@ declare class Client {
      *   myApiKeyAccount  // custom API key
      * )
      */
-    static create(connection: Aptos, networkMode?: NetworkMode, enableWs?: boolean, url?: string, apiKey?: Account): Promise<Client>;
+    static create(connection: Aptos, networkMode?: NetworkMode, enableWs?: boolean, url?: string, apiKey?: Account, wsDebug?: boolean, timeout?: number): Promise<Client>;
     setApiKey(apiKey: Account): Promise<void>;
     getContractAddress(): string;
     getApiKeySequenceNumber(): Promise<bigint | null>;
     fetchApiKeySequenceNumber(): Promise<number>;
     setTxParams(params: TxParams): void;
+    private _wsLog;
+    setWsDebugActive(active: boolean): void;
     connectWebSocket(): Promise<void>;
+    private _waitForOpen;
     private _setupWebSocketHandlers;
-    static initWebSocket(url: string, timeout?: number): Promise<WebSocket>;
     disconnectWebSocket(): Promise<void>;
     isWebSocketConnected(): boolean;
     sendWsMessage(message: WsCommand): Promise<WsMessage>;
@@ -5901,7 +5898,7 @@ declare class Client {
     getPerpMarketsData: (markets: string[]) => Promise<GetPerpMarketsDataResponse>;
     getSpotMarketsData: (markets: string[]) => Promise<GetSpotMarketsDataResponse>;
     getBorrowLendingData: () => Promise<GetBorrowLendingDataResponse>;
-    getChartCandlesInRange: ({ interval, marketName, timestampStartMs, timestampEndMs, cursor, }: IGetChartCandlesInRange) => Promise<GetChartCandlesInRangeResponse>;
+    getChartCandlesInRange: (request: GetChartCandlesInRangeRequest) => Promise<GetChartCandlesInRangeResponse>;
     getPriceIndexes: () => Promise<GetPriceIndexesResponse>;
     getUsersByAddress: (payload: GetUsersByAddressRequest) => Promise<GetUsersByAddressResponse>;
     getPerpRecentTrades: (request: GetPerpRecentTradesRequest) => Promise<GetPerpRecentTradesResponse>;
@@ -5980,4 +5977,4 @@ declare const generateApiKey: () => _aptos_labs_ts_sdk.Ed25519Account;
 declare const getTopicFromCommand: (data: WsCommand) => string;
 declare const getTopicFromMessage: (data: WsMessage) => string;
 
-export { ABIs, type AccountValueRankingEntry, type AddApiCreditsParams, type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type ApiCreditsChange, type ApiStatus, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLendUpdate, type BorrowLending, type BorrowLendingAggregatedData, type BorrowLendingHistoricalData, type BoxOpeningEvent, type BoxReward, BoxRewardTier, type CancelAllPerpOrdersParams, type CancelAllSpotOrdersParams, type CancelPerpOrdersParams, type CancelSpotOrdersParams, type CanceledPerpOrderData, type CanceledPerpOrders, type CanceledPerpTriggerOrderData, type CanceledPerpTriggerOrders, type CanceledSpotOrderData, type CanceledSpotOrders, type ChangePerpOrderParams, type ChangeSpotOrderParams, type ChartCandle, ChartInterval, type CheckReferralCodeRequest, type CheckReferralCodeResponse, type ClaimDepositParams, type ClaimKickbackFeeParams, type ClaimReferralFee, type ClaimReferralFeesParams, type ClaimUserKickbackFee, type ClaimedKickback, type ClaimedReferralKickback, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type ExchangeStatsEntry, type FeeData, type FeeTier, type Fees, type FundingCheckpoint, type FundingPayment, type FundingRate, GLOBAL_DENOMINATOR, type GetAccountValueRankingRequest, type GetAccountValueRankingResponse, type GetAllVaultsIdsResponse, type GetBorrowLendingAggregatedStatsRequest, type GetBorrowLendingAggregatedStatsResponse, type GetBorrowLendingDataResponse, type GetBorrowLendingHistoricalDataRequest, type GetBorrowLendingHistoricalDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetExchangeStatsHistoryRequest, type GetExchangeStatsHistoryResponse, type GetIndexPriceHistoryRequest, type GetIndexPriceHistoryResponse, type GetIndexPricesResponse, type GetIndexerStatusResponse, type GetOrderBookDataRequest, type GetOrderBookDataResponse, type GetPerpMarketsConfigResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpUserTriggerOrdersRequest, type GetPerpUserTriggerOrdersResponse, type GetPriceIndexesResponse, type GetServicesStatusResponse, type GetSpotMarketsConfigResponse, type GetSpotMarketsDataRequest, type GetSpotMarketsDataResponse, type GetSpotRecentTradesRequest, type GetSpotRecentTradesResponse, type GetSpotUserFillsRequest, type GetSpotUserFillsResponse, type GetSpotUserOrdersRequest, type GetSpotUserOrdersResponse, type GetTokenAggregatedStatsRequest, type GetTokenAggregatedStatsResponse, type GetTokenStatsHistoryRequest, type GetTokenStatsHistoryResponse, type GetTokensConfigResponse, type GetTopPointsRankingResponse, type GetUserAccountValueRankingRequest, type GetUserAccountValueRankingResponse, type GetUserAggregatedBoxRewardsStatsRequest, type GetUserAggregatedBoxRewardsStatsResponse, type GetUserAggregatedReferralStatsRequest, type GetUserAggregatedReferralStatsResponse, type GetUserAggregatedStatsRequest, type GetUserAggregatedStatsResponse, type GetUserAggregatedVaultStatsRequest, type GetUserAggregatedVaultStatsResponse, type GetUserBoxRewardsStatsHistoryRequest, type GetUserBoxRewardsStatsHistoryResponse, type GetUserBoxesHistoryRequest, type GetUserBoxesHistoryResponse, type GetUserClaimedKickbackHistoryRequest, type GetUserClaimedKickbackHistoryResponse, type GetUserClaimedReferralKickbackHistoryRequest, type GetUserClaimedReferralKickbackHistoryResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUserDepositsRequest, type GetUserDepositsResponse, type GetUserFullLiquidationsHistoryRequest, type GetUserFundingHistoryRequest, type GetUserFundingHistoryResponse, type GetUserLiquidationsCancelHistoryResponse, type GetUserLiquidationsCancelOrdersHistoryRequest, type GetUserLiquidationsHistoryResponse, type GetUserPartialLiquidationsHistoryRequest, type GetUserPartialLiquidationsHistoryResponse, type GetUserPersonalPointsRankingRequest, type GetUserPersonalPointsRankingResponse, type GetUserPointsHistoryRequest, type GetUserPointsHistoryResponse, type GetUserPortfolioValueRequest, type GetUserPortfolioValueResponse, type GetUserReferralStatsHistoryRequest, type GetUserReferralStatsHistoryResponse, type GetUserRewardsValueRequest, type GetUserRewardsValueResponse, type GetUserTradeStatsHistoryRequest, type GetUserTradeStatsHistoryResponse, type GetUserTransferHistoryRequest, type GetUserTransferHistoryResponse, type GetUserVaultDepositsRequest, type GetUserVaultDepositsResponse, type GetUserVaultWithdrawsRequest, type GetUserVaultWithdrawsResponse, type GetUserVolumeForReferralRequest, type GetUserVolumeForReferralResponse, type GetUserWithdrawalsRequest, type GetUserWithdrawalsResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type GetVaultDepositsRequest, type GetVaultDepositsResponse, type GetVaultHistoricalDataRequest, type GetVaultHistoricalDataResponse, type GetVaultWithdrawalsRequest, type GetVaultWithdrawalsResponse, type GlobalLiquidation, type GlobalPartialLiquidation, type HistoricBoxReward, type HistoricalBoxRewardsStats, type HistoricalDeposit, type HistoricalFullLiquidation, type HistoricalFunding, type HistoricalLiquidatedBorrow, type HistoricalLiquidatedCollateral, type HistoricalLiquidatedLend, type HistoricalLiquidatedPosition, type HistoricalLiquidationCancelOrders, type HistoricalPartialLiquidatedPosition, type HistoricalPartialLiquidation, type HistoricalPerpOrder, type HistoricalPoints, type HistoricalReferralStats, type HistoricalSpotOrder, type HistoricalTokenStats, type HistoricalTradeStats, type HistoricalUserTransfer, type HistoricalVaultDeposit, type HistoricalVaultWithdraw, type HistoricalWithdraw, type IGetChartCandlesInRange, type IndexPriceHistory, type IndexPriceLive, type Lend, type LendTokenParams, type Liquidation, type LiquidationCancelledOrderData, type LiquidationCancelledTriggerOrderData, MAINNET_CONFIG, type MarginStep, Network, type NetworkConfig, type NetworkMode, type NodeStatus, type OpenBoxesRequest, type OpenBoxesResponse, type OpenBoxesSignRequest, type OracleUpdate, type OracleUpdates, type OrderBookData, OrderSide, OrderStatus, OrderType, type PaginationCursor, type PartialLiquidation, type PerpFill, type PerpMarketConfigEntry, type PerpMarketData, type PerpOrder, type PerpOrderData, type PerpOrderDataForMarket, type PerpOrderFills, type PerpOrderbookState, type PerpOrderbookUpdate, type PerpPosition, type PerpTrade, type PerpTradesUpdate, type PerpTriggerOrder, type PerpTriggerOrderTriggered, type PlaceMultiplePerpOrdersParams, type PlaceMultipleSpotOrdersParams, type PlacePerpLimitOrder, type PlacePerpMarketOrder, type PlacePerpOrderParams, type PlacePerpTriggerOrder, type PlacePerpTriggerOrderParams, type PlaceSpotLimitOrder, type PlaceSpotMarketOrder, type PlaceSpotOrderParams, type PointsRankingEntry, type PriceIndex, type RedeemTokenParams, type Referral, type ReferralUpdate, type RemoveApiKey, type RemoveApiKeyParams, type RemoveApiKeySignerParams, type RepayBorrow, type ReplaceMultipleOrdersParams, type ReplaceMultipleSpotOrdersParams, type SetAlias, type SetAliasNameParams, type SetAutoLend, type SetAutolendParams, type SetReferralCodeParams, type SetReferralParamsRequest, type SetReferralParamsResponse, type SpotFill, type SpotMarketConfigEntry, type SpotMarketData, type SpotOrder, type SpotOrderData, type SpotOrderDataForMarket, type SpotOrderFills, type SpotOrderbookState, type SpotOrderbookUpdate, type SpotTrade, type SpotTradesUpdate, Status, type StatusResponse, type SubServiceStatus, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TESTNET_CONFIG, TestFaucet, type TimeResponse, type TokenAggregatedStats, type TokenConfigEntry, type TokenizeUserVaultInvestmentParams, type Topic, type Trade, TradeRole, TransferAction, type TransferToUserParams, type TriggerOrder, type TvlTokenEntry, type TxParams, type UpdateUserFeeTier, type User, type UserAggregatedBoxRewardsStats, type UserAggregatedReferralStats, type UserAggregatedStats, type UserAggregatedVaultStats, type UserBoxOpeningEvent, type UserPointsBreakdown, type UserPortfolioValue, type UserRewardsValue, UserStatus, type UserTransfer, type UtilizationCurve, type Vault, type VaultDeposit, type VaultHistoricalData, type VaultInvestment, type VaultWithdraw, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WithdrawTokenParams, type WsBorrowLendUpdate, type WsBoxOpeningUpdate, type WsCommand, type WsFill, type WsLiquidatedBorrow, type WsLiquidatedCollateral, type WsLiquidatedLend, type WsLiquidatedPosition, type WsLiquidationUpdate, type WsMessage, type WsOracleUpdates, type WsPartialLiquidatedPosition, type WsPerpMarketUpdates, type WsSpotMarketUpdates, type WsUserUpdates, createAptosClient, createAptosClientFromEnv, generateApiKey, getABIsForNetwork, getNetworkConfig, getNetworkModeFromEnv, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };
+export { ABIs, type AccountValueRankingEntry, type AddApiCreditsParams, type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type ApiCreditsChange, type ApiStatus, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLendUpdate, type BorrowLending, type BorrowLendingAggregatedData, type BorrowLendingHistoricalData, type BoxOpeningEvent, type BoxReward, BoxRewardTier, type CancelAllPerpOrdersParams, type CancelAllSpotOrdersParams, type CancelPerpOrdersParams, type CancelSpotOrdersParams, type CanceledPerpOrderData, type CanceledPerpOrders, type CanceledPerpTriggerOrderData, type CanceledPerpTriggerOrders, type CanceledSpotOrderData, type CanceledSpotOrders, type ChangePerpOrderParams, type ChangeSpotOrderParams, type ChartCandle, ChartInterval, type CheckReferralCodeRequest, type CheckReferralCodeResponse, type ClaimDepositParams, type ClaimKickbackFeeParams, type ClaimReferralFee, type ClaimReferralFeesParams, type ClaimUserKickbackFee, type ClaimedKickback, type ClaimedReferralKickback, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type ExchangeStatsEntry, type FeeData, type FeeTier, type Fees, type FundingCheckpoint, type FundingPayment, type FundingRate, GLOBAL_DENOMINATOR, type GetAccountValueRankingRequest, type GetAccountValueRankingResponse, type GetAllVaultsIdsResponse, type GetBorrowLendingAggregatedStatsRequest, type GetBorrowLendingAggregatedStatsResponse, type GetBorrowLendingDataResponse, type GetBorrowLendingHistoricalDataRequest, type GetBorrowLendingHistoricalDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetExchangeStatsHistoryRequest, type GetExchangeStatsHistoryResponse, type GetIndexPriceHistoryRequest, type GetIndexPriceHistoryResponse, type GetIndexPricesResponse, type GetIndexerStatusResponse, type GetOrderBookDataRequest, type GetOrderBookDataResponse, type GetPerpMarketsConfigResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpUserTriggerOrdersRequest, type GetPerpUserTriggerOrdersResponse, type GetPriceIndexesResponse, type GetServicesStatusResponse, type GetSpotMarketsConfigResponse, type GetSpotMarketsDataRequest, type GetSpotMarketsDataResponse, type GetSpotRecentTradesRequest, type GetSpotRecentTradesResponse, type GetSpotUserFillsRequest, type GetSpotUserFillsResponse, type GetSpotUserOrdersRequest, type GetSpotUserOrdersResponse, type GetTokenAggregatedStatsRequest, type GetTokenAggregatedStatsResponse, type GetTokenStatsHistoryRequest, type GetTokenStatsHistoryResponse, type GetTokensConfigResponse, type GetTopPointsRankingResponse, type GetUserAccountValueRankingRequest, type GetUserAccountValueRankingResponse, type GetUserAggregatedBoxRewardsStatsRequest, type GetUserAggregatedBoxRewardsStatsResponse, type GetUserAggregatedReferralStatsRequest, type GetUserAggregatedReferralStatsResponse, type GetUserAggregatedStatsRequest, type GetUserAggregatedStatsResponse, type GetUserAggregatedVaultStatsRequest, type GetUserAggregatedVaultStatsResponse, type GetUserBoxRewardsStatsHistoryRequest, type GetUserBoxRewardsStatsHistoryResponse, type GetUserBoxesHistoryRequest, type GetUserBoxesHistoryResponse, type GetUserClaimedKickbackHistoryRequest, type GetUserClaimedKickbackHistoryResponse, type GetUserClaimedReferralKickbackHistoryRequest, type GetUserClaimedReferralKickbackHistoryResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUserDepositsRequest, type GetUserDepositsResponse, type GetUserFullLiquidationsHistoryRequest, type GetUserFundingHistoryRequest, type GetUserFundingHistoryResponse, type GetUserLiquidationsCancelHistoryResponse, type GetUserLiquidationsCancelOrdersHistoryRequest, type GetUserLiquidationsHistoryResponse, type GetUserPartialLiquidationsHistoryRequest, type GetUserPartialLiquidationsHistoryResponse, type GetUserPersonalPointsRankingRequest, type GetUserPersonalPointsRankingResponse, type GetUserPointsHistoryRequest, type GetUserPointsHistoryResponse, type GetUserPortfolioValueRequest, type GetUserPortfolioValueResponse, type GetUserReferralStatsHistoryRequest, type GetUserReferralStatsHistoryResponse, type GetUserRewardsValueRequest, type GetUserRewardsValueResponse, type GetUserTradeStatsHistoryRequest, type GetUserTradeStatsHistoryResponse, type GetUserTransferHistoryRequest, type GetUserTransferHistoryResponse, type GetUserVaultDepositsRequest, type GetUserVaultDepositsResponse, type GetUserVaultWithdrawsRequest, type GetUserVaultWithdrawsResponse, type GetUserVolumeForReferralRequest, type GetUserVolumeForReferralResponse, type GetUserWithdrawalsRequest, type GetUserWithdrawalsResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type GetVaultDepositsRequest, type GetVaultDepositsResponse, type GetVaultHistoricalDataRequest, type GetVaultHistoricalDataResponse, type GetVaultWithdrawalsRequest, type GetVaultWithdrawalsResponse, type GlobalLiquidation, type GlobalPartialLiquidation, type HistoricBoxReward, type HistoricalBoxRewardsStats, type HistoricalDeposit, type HistoricalFullLiquidation, type HistoricalFunding, type HistoricalLiquidatedBorrow, type HistoricalLiquidatedCollateral, type HistoricalLiquidatedLend, type HistoricalLiquidatedPosition, type HistoricalLiquidationCancelOrders, type HistoricalPartialLiquidatedPosition, type HistoricalPartialLiquidation, type HistoricalPerpOrder, type HistoricalPoints, type HistoricalReferralStats, type HistoricalSpotOrder, type HistoricalTokenStats, type HistoricalTradeStats, type HistoricalUserTransfer, type HistoricalVaultDeposit, type HistoricalVaultWithdraw, type HistoricalWithdraw, type IndexPriceHistory, type IndexPriceLive, type Lend, type LendTokenParams, type Liquidation, type LiquidationCancelledOrderData, type LiquidationCancelledTriggerOrderData, MAINNET_CONFIG, type MarginStep, Network, type NetworkConfig, type NetworkMode, type NodeStatus, type OpenBoxesRequest, type OpenBoxesResponse, type OpenBoxesSignRequest, type OracleUpdate, type OracleUpdates, type OrderBookData, OrderSide, OrderStatus, OrderType, type PaginationCursor, type PartialLiquidation, type PerpFill, type PerpMarketConfigEntry, type PerpMarketData, type PerpOrder, type PerpOrderData, type PerpOrderDataForMarket, type PerpOrderFills, type PerpOrderbookState, type PerpOrderbookUpdate, type PerpPosition, type PerpTrade, type PerpTradesUpdate, type PerpTriggerOrder, type PerpTriggerOrderTriggered, type PlaceMultiplePerpOrdersParams, type PlaceMultipleSpotOrdersParams, type PlacePerpLimitOrder, type PlacePerpMarketOrder, type PlacePerpOrderParams, type PlacePerpTriggerOrder, type PlacePerpTriggerOrderParams, type PlaceSpotLimitOrder, type PlaceSpotMarketOrder, type PlaceSpotOrderParams, type PointsRankingEntry, type PriceIndex, type RedeemTokenParams, type Referral, type ReferralUpdate, type RemoveApiKey, type RemoveApiKeyParams, type RemoveApiKeySignerParams, type RepayBorrow, type ReplaceMultipleOrdersParams, type ReplaceMultipleSpotOrdersParams, type SetAlias, type SetAliasNameParams, type SetAutoLend, type SetAutolendParams, type SetReferralCodeParams, type SetReferralParamsRequest, type SetReferralParamsResponse, type SpotFill, type SpotMarketConfigEntry, type SpotMarketData, type SpotOrder, type SpotOrderData, type SpotOrderDataForMarket, type SpotOrderFills, type SpotOrderbookState, type SpotOrderbookUpdate, type SpotTrade, type SpotTradesUpdate, Status, type StatusResponse, type SubServiceStatus, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TESTNET_CONFIG, TestFaucet, type TimeResponse, type TokenAggregatedStats, type TokenConfigEntry, type TokenizeUserVaultInvestmentParams, type Topic, type Trade, TradeRole, TransferAction, type TransferToUserParams, type TriggerOrder, type TvlTokenEntry, type TxParams, type UpdateUserFeeTier, type User, type UserAggregatedBoxRewardsStats, type UserAggregatedReferralStats, type UserAggregatedStats, type UserAggregatedVaultStats, type UserBoxOpeningEvent, type UserPointsBreakdown, type UserPortfolioValue, type UserRewardsValue, UserStatus, type UserTransfer, type UtilizationCurve, type Vault, type VaultDeposit, type VaultHistoricalData, type VaultInvestment, type VaultWithdraw, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WithdrawTokenParams, type WsBorrowLendUpdate, type WsBoxOpeningUpdate, type WsCommand, type WsFill, type WsLiquidatedBorrow, type WsLiquidatedCollateral, type WsLiquidatedLend, type WsLiquidatedPosition, type WsLiquidationUpdate, type WsMessage, type WsOracleUpdates, type WsPartialLiquidatedPosition, type WsPerpMarketUpdates, type WsSpotMarketUpdates, type WsUserUpdates, createAptosClient, createAptosClientFromEnv, generateApiKey, getABIsForNetwork, getNetworkConfig, getNetworkModeFromEnv, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };

package/dist/index.js

@@ -23892,13 +23892,15 @@ var AccountSequenceNumber = class {
 // src/client.ts
 var getRandomId = () => uuidv7();
 var Client = class _Client {
-  constructor(connection, enableWs, url, apiKey, chainId, params, networkMode = "testnet") {
+  constructor(connection, enableWs, url, apiKey, chainId, params, networkMode = "testnet", wsDebug = false, timeout = 5e3) {
     this._apiKeySequenceNumber = 0;
     this._subscriptions = /* @__PURE__ */ new Map();
     this._gasUnitPrice = 100;
     this._expirationTimestampDelay = 20;
     // 20 seconds
     this.timeout = 5e3;
+    // Same as below in init
+    this.wsDebug = false;
     /////////////////////////////////// Sponsored transactions
     this.submitSponsoredTransaction = async (tx, signature) => {
       const payload = {
@@ -24049,24 +24051,11 @@ var Client = class _Client {
       const response = await this.sendGetJson("/v1/get_borrow_lending_data" /* GetBorrowLendingData */);
       return response;
     };
-    this.getChartCandlesInRange = async ({
-      interval,
-      marketName,
-      timestampStartMs = Math.round((/* @__PURE__ */ new Date()).getTime()),
-      timestampEndMs = Math.round((/* @__PURE__ */ new Date()).getTime() - 24 * 60 * 60 * 1e3),
-      // default 24 back
-      cursor
-    }) => {
-      if (timestampEndMs && timestampStartMs && timestampEndMs > timestampStartMs) {
-        throw new Error("timestampEndMs must be lower than timestampStartMs");
+    this.getChartCandlesInRange = async (request) => {
+      if (request.olderTimestampMs && request.newerTimestampMs && request.olderTimestampMs > request.newerTimestampMs) {
+        throw new Error("olderTimestampMs must be lower than newerTimestampMs");
       }
-      const response = await this.sendGetJson("/v1/public/chart_candles_in_range" /* GetChartCandlesInRange */, {
-        marketName,
-        interval,
-        startTimestamp: timestampStartMs.toString(),
-        endTimestamp: timestampEndMs.toString(),
-        paginationCursor: cursor
-      });
+      const response = await this.sendGetJson("/v1/public/chart_candles_in_range" /* GetChartCandlesInRange */, request);
       return response;
     };
     this.getPriceIndexes = async () => {
@@ -24361,13 +24350,25 @@ var Client = class _Client {
     this._maxGas = params?.maxGas || 2e4;
     this._gasUnitPrice = params?.gasUnitPrice || 100;
     this._expirationTimestampDelay = params?.expirationTimestampSecs || 20;
+    this.wsDebug = wsDebug;
+    this.timeout = timeout;
     if (enableWs) {
       this.connectWebSocket();
     }
   }
-  static async init(connection, enableWs = true, url, apiKey, chainId, params, networkMode = "testnet") {
+  static async init(connection, enableWs = true, url, apiKey, chainId, params, networkMode = "testnet", wsDebug = false, timeout = 5e3) {
     const id = chainId || await connection.getChainId();
-    const client = new _Client(connection, enableWs, url, apiKey, id, params, networkMode);
+    const client = new _Client(
+      connection,
+      enableWs,
+      url,
+      apiKey,
+      id,
+      params,
+      networkMode,
+      wsDebug,
+      timeout
+    );
     if (enableWs) {
       client.connectWebSocket();
     }
@@ -24401,11 +24402,21 @@ var Client = class _Client {
    *   myApiKeyAccount  // custom API key
    * )
    */
-  static async create(connection, networkMode = "testnet", enableWs = true, url, apiKey) {
+  static async create(connection, networkMode = "testnet", enableWs = true, url, apiKey, wsDebug = false, timeout = 5e3) {
     const networkConfig = getNetworkConfig(networkMode);
     const apiUrl = url || networkConfig.apiUrl;
     const chainId = networkConfig.chainId;
-    return _Client.init(connection, enableWs, apiUrl, apiKey, chainId, void 0, networkMode);
+    return _Client.init(
+      connection,
+      enableWs,
+      apiUrl,
+      apiKey,
+      chainId,
+      void 0,
+      networkMode,
+      wsDebug,
+      timeout
+    );
   }
   async setApiKey(apiKey) {
     this._apiKey = apiKey;
@@ -24431,21 +24442,60 @@ var Client = class _Client {
     this._expirationTimestampDelay = params.expirationTimestampSecs;
   }
   //////////////////////////////////////// Websocket functions
+  _wsLog(...args) {
+    if (this.wsDebug) console.log("[WS]", ...args);
+  }
+  setWsDebugActive(active) {
+    this.wsDebug = active;
+  }
   async connectWebSocket() {
     if (this._ws) {
       console.warn("WebSocket is already connected");
       return;
     }
     try {
-      this._ws = await _Client.initWebSocket(this._serverUrl, this.timeout);
+      const wsUrl = `${this._serverUrl.replace("http", "ws").replace("https", "wss")}` + "/v1/ws" /* Ws */;
+      this._wsLog("Connecting to", wsUrl);
+      this._ws = new WebSocket(wsUrl);
       this._setupWebSocketHandlers();
-      return;
+      await this._waitForOpen(this.timeout);
+      this._wsLog("Connected");
     } catch (error) {
+      this._wsLog("Connection failed:", error);
+      this._ws = void 0;
       throw new Error(`Failed to connect WebSocket: ${error}`);
     }
   }
+  _waitForOpen(timeout) {
+    return new Promise((resolve, reject) => {
+      if (!this._ws) return reject(new Error("No WebSocket"));
+      if (this._ws.readyState === WebSocket.OPEN) {
+        return resolve();
+      }
+      const timer = setTimeout(() => {
+        this._wsLog("Connection timeout after", timeout, "ms");
+        reject(new Error("WebSocket connection timeout"));
+      }, timeout);
+      const ws = this._ws;
+      const origOnOpen = ws.onopen;
+      ws.onopen = (event) => {
+        clearTimeout(timer);
+        origOnOpen?.call(ws, event);
+        resolve();
+      };
+      const origOnError = ws.onerror;
+      ws.onerror = (error) => {
+        clearTimeout(timer);
+        origOnError?.call(ws, error);
+        reject(error);
+      };
+    });
+  }
   _setupWebSocketHandlers() {
     if (!this._ws) return;
+    this._ws.onopen = () => {
+      this._wsLog("Opened");
+    };
     this._ws.onmessage = async (msg) => {
       let data;
       if (msg.data.arrayBuffer) {
@@ -24454,49 +24504,52 @@ var Client = class _Client {
         data = msg.data;
       }
       const decodedMsg = JSON.parse(data);
+      this._wsLog("Received:", decodedMsg.type, decodedMsg.content);
       const topic = getTopicFromMessage(decodedMsg);
       const callback = this._subscriptions.get(topic);
       if (callback) {
         callback(decodedMsg);
+      } else {
+        this._wsLog("No handler for topic:", topic);
       }
     };
-  }
-  static async initWebSocket(url, timeout = 5e3) {
-    return new Promise((resolve, reject) => {
-      const ws = new WebSocket(
-        `${url.replace("http", "ws").replace("https", "wss")}` + "/v1/ws" /* Ws */
+    this._ws.onclose = (event) => {
+      this._wsLog(
+        "Closed: code=" + event.code,
+        "reason=" + event.reason,
+        "clean=" + event.wasClean
       );
-      const timer = setTimeout(() => {
-        reject(new Error("WebSocket connection timeout"));
-      }, timeout);
-      ws.onopen = () => {
-        clearTimeout(timer);
-        resolve(ws);
-      };
-      ws.onerror = (error) => {
-        clearTimeout(timer);
-        reject(error);
-      };
-    });
+      this._ws = void 0;
+      this._subscriptions.clear();
+      this.onWsClose?.(event);
+    };
+    this._ws.onerror = (error) => {
+      this._wsLog("Error:", error);
+    };
   }
   async disconnectWebSocket() {
     if (!this._ws) {
       console.warn("WebSocket is not connected");
       return;
     }
+    this._wsLog("Disconnecting, clearing", this._subscriptions.size, "subscriptions");
     this._subscriptions.clear();
     this._ws.close();
     this._ws = void 0;
   }
   // Method to check if WebSocket is connected
   isWebSocketConnected() {
-    return this._ws !== void 0 && this._ws.readyState === WebSocket.OPEN;
+    const connected = this._ws !== void 0 && this._ws.readyState === WebSocket.OPEN;
+    this._wsLog("isWebSocketConnected:", connected);
+    return connected;
   }
   sendWsMessage(message) {
     if (!this._ws) throw new Error("WebSocket is not connected");
     return new Promise((resolve, reject) => {
       const topic = message.content.id;
+      this._wsLog("Sending:", message.type, "id=" + topic);
       const timer = setTimeout(() => {
+        this._wsLog("Timeout waiting for response:", message.type, "id=" + topic);
         reject(new Error(`Connection timed out after ${this.timeout} ms`));
       }, this.timeout);
       let handler = (response) => {
@@ -24504,11 +24557,13 @@ var Client = class _Client {
         this._subscriptions.delete(topic);
         if (response.type === "Error") {
           const errorMessage = response.content.message || "Unknown websocket error without message";
+          this._wsLog("Error response:", errorMessage, "id=" + topic);
           reject(
             new Error(`WebSocket error (id: ${response.content.id}): ${errorMessage}`)
           );
           return;
         }
+        this._wsLog("Ack received for:", message.type, "id=" + topic);
         resolve(response);
       };
       this._subscriptions.set(topic, handler);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nightlylabs/dex-sdk",
-    "version": "0.3.36",
+    "version": "0.3.37",
     "type": "module",
     "exports": {
         ".": {