@yuants/vendor-aster 0.7.7 → 0.7.9

package/dist/api/private-api.js

@@ -1,5 +1,4 @@
-import { HmacSHA256 } from '@yuants/utils';
-import { uint8ArrayToHex } from '../utils';
+import { encodeHex, HmacSHA256 } from '@yuants/utils';
 const request = async (credential, method, baseURL, endpoint, params = {}) => {
     const url = new URL(baseURL);
     url.pathname = endpoint;
@@ -10,7 +9,7 @@ const request = async (credential, method, baseURL, endpoint, params = {}) => {
     }
     url.searchParams.set('timestamp', `${Date.now()}`);
     const msg = url.search.slice(1); // 去掉开头的 '?'
-    const signature = uint8ArrayToHex(await HmacSHA256(new TextEncoder().encode(msg), new TextEncoder().encode(credential.secret_key)));
+    const signature = encodeHex(await HmacSHA256(new TextEncoder().encode(msg), new TextEncoder().encode(credential.secret_key)));
     url.searchParams.set('signature', signature);
     console.info(url.toString());
     const response = await fetch(url.toString(), {

package/dist/api/private-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"private-api.js","sourceRoot":"","sources":["../../src/api/private-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { HmacSHA256 } from '@yuants/utils';\nimport { uint8ArrayToHex } from '../utils';\n\nexport interface ICredential {\n  address: string;\n  api_key: string;\n  secret_key: string;\n}\n\nexport interface IAsterFutureOpenOrder {\n  orderId: number;\n  clientOrderId: string;\n  price: string;\n  origQty: string;\n  executedQty: string;\n  status: string;\n  timeInForce: string;\n  type: string;\n  side: 'BUY' | 'SELL';\n  updateTime: number;\n  avgPrice: string;\n  reduceOnly?: boolean;\n  closePosition?: boolean;\n  positionSide?: 'BOTH' | 'LONG' | 'SHORT';\n  workingType?: string;\n  priceProtect?: boolean;\n  origType?: string;\n  stopPrice?: string;\n  symbol: string;\n}\n\nexport interface IAsterSpotOpenOrder {\n  orderId: number;\n  clientOrderId: string;\n  price: string;\n  origQty: string;\n  executedQty: string;\n  cummulativeQuoteQty?: string;\n  status: string;\n  timeInForce: string;\n  type: string;\n  side: 'BUY' | 'SELL';\n  stopPrice?: string;\n  icebergQty?: string;\n  time: number;\n  updateTime: number;\n  isWorking?: boolean;\n  avgPrice?: string;\n  symbol: string;\n}\n\nconst request = async <T>(\n  credential: ICredential,\n  method: string,\n  baseURL: string,\n  endpoint: string,\n  params: any = {},\n): Promise<T> => {\n  const url = new URL(baseURL);\n  url.pathname = endpoint;\n  for (const [key, value] of Object.entries(params)) {\n    if (value === undefined) continue;\n    url.searchParams.set(key, `${value}`);\n  }\n\n  url.searchParams.set('timestamp', `${Date.now()}`);\n  const msg = url.search.slice(1); // 去掉开头的 '?'\n  const signature = uint8ArrayToHex(\n    await HmacSHA256(new TextEncoder().encode(msg), new TextEncoder().encode(credential.secret_key)),\n  );\n  url.searchParams.set('signature', signature);\n\n  console.info(url.toString());\n  const response = await fetch(url.toString(), {\n    method,\n    headers: {\n      'X-MBX-APIKEY': credential.api_key,\n    },\n  });\n\n  const resText = await response.text();\n\n  try {\n    const res = JSON.parse(resText);\n\n    if (res.code && res.code !== 0) {\n      throw resText;\n    }\n    return res;\n  } catch (e) {\n    throw `APIError: ${response.status} ${response.statusText} ${resText}`;\n  }\n};\n\nconst createApi =\n  (baseURL: string) =>\n  <TReq, TRes>(method: string, endpoint: string) =>\n  (credential: ICredential, params: TReq) =>\n    request<TRes>(credential, method, baseURL, endpoint, params);\n\nconst createFutureApi = createApi('https://fapi.asterdex.com');\nconst createSpotApi = createApi('https://sapi.asterdex.com');\n\n/**\n * 获取账户信息\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-futures-api_CN.md#%E8%B4%A6%E6%88%B7%E4%BF%A1%E6%81%AFv4-user_data\n */\nexport const getFApiV4Account = createFutureApi<\n  {},\n  {\n    feeTier: number;\n    canTrade: boolean;\n    canDeposit: boolean;\n    canWithdraw: boolean;\n    updateTime: number;\n    totalInitialMargin: string;\n    totalMaintMargin: string;\n    totalWalletBalance: string;\n    totalUnrealizedProfit: string;\n    totalMarginBalance: string;\n    totalPositionInitialMargin: string;\n    totalOpenOrderInitialMargin: string;\n    totalCrossWalletBalance: string;\n    totalCrossUnPnl: string;\n    availableBalance: string;\n    maxWithdrawAmount: string;\n    assets: {\n      asset: string;\n      walletBalance: string;\n      unrealizedProfit: string;\n      marginBalance: string;\n      maintMargin: string;\n      initialMargin: string;\n      positionInitialMargin: string;\n      openOrderInitialMargin: string;\n      maxWithdrawAmount: string;\n      crossWalletBalance: string;\n      crossUnPnl: string;\n      availableBalance: string;\n      marginAvailable: boolean;\n      updateTime: number;\n    }[];\n    positions: {\n      symbol: string;\n      initialMargin: string;\n      maintMargin: string;\n      unrealizedProfit: string;\n      positionInitialMargin: string;\n      openOrderInitialMargin: string;\n      leverage: string;\n      isolated: boolean;\n      entryPrice: string;\n      maxNotional: string;\n      positionSide: 'BOTH' | 'LONG' | 'SHORT';\n      positionAmt: string;\n      notional: string;\n      isolatedWallet: string;\n      updateTime: number;\n    }[];\n  }\n>('GET', '/fapi/v4/account');\n\nexport const getFApiV2Balance = createFutureApi<\n  {},\n  {\n    accountAlias: string; // 账户唯一识别码\n    asset: string; // 资产\n    balance: string; // 总余额\n    crossWalletBalance: string; // 全仓余额\n    crossUnPnl: string; // 全仓持仓未实现盈亏\n    availableBalance: string; // 下单可用余额\n    maxWithdrawAmount: string; // 最大可转出余额\n    marginAvailable: boolean; // 是否可用作联合保证金\n    updateTime: number;\n  }[]\n>('GET', '/fapi/v2/balance');\n\nexport const postFApiV1Order = createFutureApi<\n  {\n    symbol: string;\n    side: 'BUY' | 'SELL';\n    positionSide?: 'BOTH' | 'LONG' | 'SHORT';\n    type:\n      | 'MARKET'\n      | 'LIMIT'\n      | 'STOP'\n      | 'STOP_MARKET'\n      | 'TAKE_PROFIT'\n      | 'TAKE_PROFIT_MARKET'\n      | 'TRAILING_STOP_MARKET';\n    reduceOnly?: 'true' | 'false';\n    quantity?: number;\n    price?: number;\n    timeInForce?: 'GTC' | 'IOC' | 'FOK' | 'GTX' | 'HIDDEN';\n  },\n  {}\n>('POST', '/fapi/v1/order');\n\n/**\n * 查询当前挂单 (永续)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-futures-api_CN.md#L2728-L2766\n */\nexport const getFApiV1OpenOrders = createFutureApi<\n  {\n    symbol?: string;\n  },\n  IAsterFutureOpenOrder[]\n>('GET', '/fapi/v1/openOrders');\n\n/**\n * 查询当前挂单 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#L1196-L1234\n */\nexport const getApiV1OpenOrders = createSpotApi<\n  {\n    symbol?: string;\n  },\n  IAsterSpotOpenOrder[]\n>('GET', '/api/v1/openOrders');\n\nexport const deleteFApiV1Order = createFutureApi<\n  {\n    symbol: string;\n    orderId?: string | number;\n    origClientOrderId?: string;\n  },\n  {}\n>('DELETE', '/fapi/v1/order');\n\n/**\n * 获取账户信息 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#%E8%B4%A6%E6%88%B7%E4%BF%A1%E6%81%AF-user_data\n */\nexport const getApiV1Account = createSpotApi<\n  {},\n  {\n    feeTier: number;\n    canTrade: boolean;\n    canDeposit: boolean;\n    canWithdraw: boolean;\n    canBurnAsset: boolean;\n    updateTime: number;\n    balances: {\n      asset: string;\n      free: string;\n      locked: string;\n    }[];\n  }\n>('GET', '/api/v1/account');\n\n/**\n * 获取最新价格\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#%E6%9C%80%E6%96%B0%E4%BB%B7%E6%A0%BC\n */\nexport const getApiV1TickerPrice = createSpotApi<\n  {},\n  {\n    symbol: string;\n    price: string;\n    time: number;\n  }[]\n>('GET', '/api/v1/ticker/price');\n\nexport const postApiV1Order = createSpotApi<\n  {\n    symbol: string;\n    side: 'BUY' | 'SELL';\n    type: 'MARKET' | 'LIMIT' | 'STOP' | 'STOP_MARKET' | 'TAKE_PROFIT' | 'TAKE_PROFIT_MARKET';\n    timeInForce?: 'GTC' | 'IOC' | 'FOK' | 'GTX';\n    quantity?: number;\n    quoteOrderQty?: number;\n    price?: number;\n  },\n  {\n    orderId: number; // 系统的订单ID\n  }\n>('POST', '/api/v1/order');\n\n/**\n * 取消有效订单 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#L1040-L1074\n */\nexport const deleteApiV1Order = createSpotApi<\n  {\n    symbol: string;\n    orderId?: string | number;\n    origClientOrderId?: string;\n  },\n  {}\n>('DELETE', '/api/v1/order');\n"]}
+{"version":3,"file":"private-api.js","sourceRoot":"","sources":["../../src/api/private-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { encodeHex, HmacSHA256 } from '@yuants/utils';\n\nexport interface ICredential {\n  address: string;\n  api_key: string;\n  secret_key: string;\n}\n\nexport interface IAsterFutureOpenOrder {\n  orderId: number;\n  clientOrderId: string;\n  price: string;\n  origQty: string;\n  executedQty: string;\n  status: string;\n  timeInForce: string;\n  type: string;\n  side: 'BUY' | 'SELL';\n  updateTime: number;\n  avgPrice: string;\n  reduceOnly?: boolean;\n  closePosition?: boolean;\n  positionSide?: 'BOTH' | 'LONG' | 'SHORT';\n  workingType?: string;\n  priceProtect?: boolean;\n  origType?: string;\n  stopPrice?: string;\n  symbol: string;\n}\n\nexport interface IAsterSpotOpenOrder {\n  orderId: number;\n  clientOrderId: string;\n  price: string;\n  origQty: string;\n  executedQty: string;\n  cummulativeQuoteQty?: string;\n  status: string;\n  timeInForce: string;\n  type: string;\n  side: 'BUY' | 'SELL';\n  stopPrice?: string;\n  icebergQty?: string;\n  time: number;\n  updateTime: number;\n  isWorking?: boolean;\n  avgPrice?: string;\n  symbol: string;\n}\n\nconst request = async <T>(\n  credential: ICredential,\n  method: string,\n  baseURL: string,\n  endpoint: string,\n  params: any = {},\n): Promise<T> => {\n  const url = new URL(baseURL);\n  url.pathname = endpoint;\n  for (const [key, value] of Object.entries(params)) {\n    if (value === undefined) continue;\n    url.searchParams.set(key, `${value}`);\n  }\n\n  url.searchParams.set('timestamp', `${Date.now()}`);\n  const msg = url.search.slice(1); // 去掉开头的 '?'\n  const signature = encodeHex(\n    await HmacSHA256(new TextEncoder().encode(msg), new TextEncoder().encode(credential.secret_key)),\n  );\n  url.searchParams.set('signature', signature);\n\n  console.info(url.toString());\n  const response = await fetch(url.toString(), {\n    method,\n    headers: {\n      'X-MBX-APIKEY': credential.api_key,\n    },\n  });\n\n  const resText = await response.text();\n\n  try {\n    const res = JSON.parse(resText);\n\n    if (res.code && res.code !== 0) {\n      throw resText;\n    }\n    return res;\n  } catch (e) {\n    throw `APIError: ${response.status} ${response.statusText} ${resText}`;\n  }\n};\n\nconst createApi =\n  (baseURL: string) =>\n  <TReq, TRes>(method: string, endpoint: string) =>\n  (credential: ICredential, params: TReq) =>\n    request<TRes>(credential, method, baseURL, endpoint, params);\n\nconst createFutureApi = createApi('https://fapi.asterdex.com');\nconst createSpotApi = createApi('https://sapi.asterdex.com');\n\n/**\n * 获取账户信息\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-futures-api_CN.md#%E8%B4%A6%E6%88%B7%E4%BF%A1%E6%81%AFv4-user_data\n */\nexport const getFApiV4Account = createFutureApi<\n  {},\n  {\n    feeTier: number;\n    canTrade: boolean;\n    canDeposit: boolean;\n    canWithdraw: boolean;\n    updateTime: number;\n    totalInitialMargin: string;\n    totalMaintMargin: string;\n    totalWalletBalance: string;\n    totalUnrealizedProfit: string;\n    totalMarginBalance: string;\n    totalPositionInitialMargin: string;\n    totalOpenOrderInitialMargin: string;\n    totalCrossWalletBalance: string;\n    totalCrossUnPnl: string;\n    availableBalance: string;\n    maxWithdrawAmount: string;\n    assets: {\n      asset: string;\n      walletBalance: string;\n      unrealizedProfit: string;\n      marginBalance: string;\n      maintMargin: string;\n      initialMargin: string;\n      positionInitialMargin: string;\n      openOrderInitialMargin: string;\n      maxWithdrawAmount: string;\n      crossWalletBalance: string;\n      crossUnPnl: string;\n      availableBalance: string;\n      marginAvailable: boolean;\n      updateTime: number;\n    }[];\n    positions: {\n      symbol: string;\n      initialMargin: string;\n      maintMargin: string;\n      unrealizedProfit: string;\n      positionInitialMargin: string;\n      openOrderInitialMargin: string;\n      leverage: string;\n      isolated: boolean;\n      entryPrice: string;\n      maxNotional: string;\n      positionSide: 'BOTH' | 'LONG' | 'SHORT';\n      positionAmt: string;\n      notional: string;\n      isolatedWallet: string;\n      updateTime: number;\n    }[];\n  }\n>('GET', '/fapi/v4/account');\n\nexport const getFApiV2Balance = createFutureApi<\n  {},\n  {\n    accountAlias: string; // 账户唯一识别码\n    asset: string; // 资产\n    balance: string; // 总余额\n    crossWalletBalance: string; // 全仓余额\n    crossUnPnl: string; // 全仓持仓未实现盈亏\n    availableBalance: string; // 下单可用余额\n    maxWithdrawAmount: string; // 最大可转出余额\n    marginAvailable: boolean; // 是否可用作联合保证金\n    updateTime: number;\n  }[]\n>('GET', '/fapi/v2/balance');\n\nexport const postFApiV1Order = createFutureApi<\n  {\n    symbol: string;\n    side: 'BUY' | 'SELL';\n    positionSide?: 'BOTH' | 'LONG' | 'SHORT';\n    type:\n      | 'MARKET'\n      | 'LIMIT'\n      | 'STOP'\n      | 'STOP_MARKET'\n      | 'TAKE_PROFIT'\n      | 'TAKE_PROFIT_MARKET'\n      | 'TRAILING_STOP_MARKET';\n    reduceOnly?: 'true' | 'false';\n    quantity?: number;\n    price?: number;\n    timeInForce?: 'GTC' | 'IOC' | 'FOK' | 'GTX' | 'HIDDEN';\n  },\n  {}\n>('POST', '/fapi/v1/order');\n\n/**\n * 查询当前挂单 (永续)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-futures-api_CN.md#L2728-L2766\n */\nexport const getFApiV1OpenOrders = createFutureApi<\n  {\n    symbol?: string;\n  },\n  IAsterFutureOpenOrder[]\n>('GET', '/fapi/v1/openOrders');\n\n/**\n * 查询当前挂单 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#L1196-L1234\n */\nexport const getApiV1OpenOrders = createSpotApi<\n  {\n    symbol?: string;\n  },\n  IAsterSpotOpenOrder[]\n>('GET', '/api/v1/openOrders');\n\nexport const deleteFApiV1Order = createFutureApi<\n  {\n    symbol: string;\n    orderId?: string | number;\n    origClientOrderId?: string;\n  },\n  {}\n>('DELETE', '/fapi/v1/order');\n\n/**\n * 获取账户信息 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#%E8%B4%A6%E6%88%B7%E4%BF%A1%E6%81%AF-user_data\n */\nexport const getApiV1Account = createSpotApi<\n  {},\n  {\n    feeTier: number;\n    canTrade: boolean;\n    canDeposit: boolean;\n    canWithdraw: boolean;\n    canBurnAsset: boolean;\n    updateTime: number;\n    balances: {\n      asset: string;\n      free: string;\n      locked: string;\n    }[];\n  }\n>('GET', '/api/v1/account');\n\n/**\n * 获取最新价格\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#%E6%9C%80%E6%96%B0%E4%BB%B7%E6%A0%BC\n */\nexport const getApiV1TickerPrice = createSpotApi<\n  {},\n  {\n    symbol: string;\n    price: string;\n    time: number;\n  }[]\n>('GET', '/api/v1/ticker/price');\n\nexport const postApiV1Order = createSpotApi<\n  {\n    symbol: string;\n    side: 'BUY' | 'SELL';\n    type: 'MARKET' | 'LIMIT' | 'STOP' | 'STOP_MARKET' | 'TAKE_PROFIT' | 'TAKE_PROFIT_MARKET';\n    timeInForce?: 'GTC' | 'IOC' | 'FOK' | 'GTX';\n    quantity?: number;\n    quoteOrderQty?: number;\n    price?: number;\n  },\n  {\n    orderId: number; // 系统的订单ID\n  }\n>('POST', '/api/v1/order');\n\n/**\n * 取消有效订单 (现货)\n *\n * https://github.com/asterdex/api-docs/blob/master/aster-finance-spot-api_CN.md#L1040-L1074\n */\nexport const deleteApiV1Order = createSpotApi<\n  {\n    symbol: string;\n    orderId?: string | number;\n    origClientOrderId?: string;\n  },\n  {}\n>('DELETE', '/api/v1/order');\n"]}

package/dist/index.js

@@ -1,7 +1,5 @@
 import './services/markets/interest_rate';
 import './services/markets/product';
 import './services/markets/quote';
-import './services/account-actions-with-credential';
-import './services/legacy';
-import './services/order-actions-with-credential';
+import './services/exchange';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,4BAA4B,CAAC;AACpC,OAAO,0BAA0B,CAAC;AAClC,OAAO,4CAA4C,CAAC;AACpD,OAAO,mBAAmB,CAAC;AAC3B,OAAO,0CAA0C,CAAC","sourcesContent":["import './services/markets/interest_rate';\nimport './services/markets/product';\nimport './services/markets/quote';\nimport './services/account-actions-with-credential';\nimport './services/legacy';\nimport './services/order-actions-with-credential';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,4BAA4B,CAAC;AACpC,OAAO,0BAA0B,CAAC;AAClC,OAAO,qBAAqB,CAAC","sourcesContent":["import './services/markets/interest_rate';\nimport './services/markets/product';\nimport './services/markets/quote';\nimport './services/exchange';\n"]}

package/dist/services/accounts/perp.js

@@ -8,7 +8,7 @@ export const getPerpAccountInfo = async (credential) => {
         .filter((p) => +p.positionAmt !== 0)
         .map((p) => ({
         position_id: p.symbol,
-        product_id: encodePath('PERPETUAL', p.symbol),
+        product_id: encodePath('ASTER', 'PERP', p.symbol),
         datasource_id: 'ASTER',
         direction: p.positionSide === 'BOTH' ? (+p.positionAmt > 0 ? 'LONG' : 'SHORT') : p.positionSide,
         volume: Math.abs(+p.positionAmt),

package/dist/services/accounts/perp.js.map

@@ -1 +1 @@
-{"version":3,"file":"perp.js","sourceRoot":"","sources":["../../../src/services/accounts/perp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AAEtE,MAAM,CAAC,MAAM,kBAAkB,GAAgD,KAAK,EAAE,UAAU,EAAE,EAAE;IAClG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAChE,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAEjC,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC;SACnC,GAAG,CACF,CAAC,CAAC,EAAa,EAAE,CAAC,CAAC;QACjB,WAAW,EAAE,CAAC,CAAC,MAAM;QACrB,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QAC7C,aAAa,EAAE,OAAO;QACtB,SAAS,EAAE,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY;QAC/F,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAChC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACrC,cAAc,EAAE,CAAC,CAAC,CAAC,UAAU;QAC7B,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;QACtD,eAAe,EAAE,CAAC,CAAC,CAAC,gBAAgB;QACpC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;KACjC,CAAC,CACH,CAAC;IACJ,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { getFApiV4Account, ICredential } from '../../api/private-api';\n\nexport const getPerpAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  const [a] = await Promise.all([getFApiV4Account(credential, {})]);\n\n  const equity = +a.totalWalletBalance + +a.totalUnrealizedProfit;\n  const free = +a.availableBalance;\n\n  const positions = a.positions\n    .filter((p) => +p.positionAmt !== 0)\n    .map(\n      (p): IPosition => ({\n        position_id: p.symbol,\n        product_id: encodePath('PERPETUAL', p.symbol),\n        datasource_id: 'ASTER',\n        direction: p.positionSide === 'BOTH' ? (+p.positionAmt > 0 ? 'LONG' : 'SHORT') : p.positionSide,\n        volume: Math.abs(+p.positionAmt),\n        free_volume: Math.abs(+p.positionAmt),\n        position_price: +p.entryPrice,\n        closable_price: Math.abs(+p.notional / +p.positionAmt),\n        floating_profit: +p.unrealizedProfit,\n        valuation: Math.abs(+p.notional),\n      }),\n    );\n  return positions;\n};\n"]}
+{"version":3,"file":"perp.js","sourceRoot":"","sources":["../../../src/services/accounts/perp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AAEtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,UAAuB,EAAE,EAAE;IAClE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAChE,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAEjC,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC;SACnC,GAAG,CACF,CAAC,CAAC,EAAa,EAAE,CAAC,CAAC;QACjB,WAAW,EAAE,CAAC,CAAC,MAAM;QACrB,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACjD,aAAa,EAAE,OAAO;QACtB,SAAS,EAAE,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY;QAC/F,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAChC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACrC,cAAc,EAAE,CAAC,CAAC,CAAC,UAAU;QAC7B,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;QACtD,eAAe,EAAE,CAAC,CAAC,CAAC,gBAAgB;QACpC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;KACjC,CAAC,CACH,CAAC;IACJ,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { getFApiV4Account, ICredential } from '../../api/private-api';\n\nexport const getPerpAccountInfo = async (credential: ICredential) => {\n  const [a] = await Promise.all([getFApiV4Account(credential, {})]);\n\n  const equity = +a.totalWalletBalance + +a.totalUnrealizedProfit;\n  const free = +a.availableBalance;\n\n  const positions = a.positions\n    .filter((p) => +p.positionAmt !== 0)\n    .map(\n      (p): IPosition => ({\n        position_id: p.symbol,\n        product_id: encodePath('ASTER', 'PERP', p.symbol),\n        datasource_id: 'ASTER',\n        direction: p.positionSide === 'BOTH' ? (+p.positionAmt > 0 ? 'LONG' : 'SHORT') : p.positionSide,\n        volume: Math.abs(+p.positionAmt),\n        free_volume: Math.abs(+p.positionAmt),\n        position_price: +p.entryPrice,\n        closable_price: Math.abs(+p.notional / +p.positionAmt),\n        floating_profit: +p.unrealizedProfit,\n        valuation: Math.abs(+p.notional),\n      }),\n    );\n  return positions;\n};\n"]}

package/dist/services/accounts/profile.js

@@ -0,0 +1,10 @@
+import { encodePath } from '@yuants/utils';
+import { getFApiV2Balance } from '../../api/private-api';
+export const getCredentialId = async (credential) => {
+    const accountBalance = await getFApiV2Balance(credential, {});
+    if (!(accountBalance === null || accountBalance === void 0 ? void 0 : accountBalance[0])) {
+        throw new Error('No Account Balance');
+    }
+    return encodePath('ASTER', accountBalance[0].accountAlias);
+};
+//# sourceMappingURL=profile.js.map

package/dist/services/accounts/profile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../src/services/accounts/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AAEtE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,UAAuB,EAAmB,EAAE;IAChF,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,CAAC,CAAC,CAAA,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACvC;IACD,OAAO,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;AAC7D,CAAC,CAAC","sourcesContent":["import { encodePath } from '@yuants/utils';\nimport { getFApiV2Balance, ICredential } from '../../api/private-api';\n\nexport const getCredentialId = async (credential: ICredential): Promise<string> => {\n  const accountBalance = await getFApiV2Balance(credential, {});\n  if (!accountBalance?.[0]) {\n    throw new Error('No Account Balance');\n  }\n  return encodePath('ASTER', accountBalance[0].accountAlias);\n};\n"]}

package/dist/services/accounts/spot.js

@@ -1,9 +1,11 @@
 import { makeSpotPosition } from '@yuants/data-account';
-import { getApiV1Account, getApiV1TickerPrice } from '../../api/private-api';
-export const getSpotAccountInfo = async (credential, account_id) => {
-    const [x, prices] = await Promise.all([
+import { getApiV1Account, getApiV1TickerPrice, getFApiV4Account } from '../../api/private-api';
+import { encodePath } from '@yuants/utils';
+export const getSpotAccountInfo = async (credential) => {
+    const [x, prices, prep] = await Promise.all([
         getApiV1Account(credential, {}),
         getApiV1TickerPrice(credential, {}),
+        getFApiV4Account(credential, {}),
     ]);
     const positions = x.balances.map((b) => {
         var _a, _b;
@@ -11,12 +13,26 @@ export const getSpotAccountInfo = async (credential, account_id) => {
         return makeSpotPosition({
             position_id: b.asset,
             datasource_id: 'ASTER',
-            product_id: b.asset,
+            product_id: encodePath('ASTER', 'SPOT', b.asset),
             volume: +b.free + +b.locked,
             free_volume: +b.free,
             closable_price: +thePrice,
         });
     });
-    return positions;
+    const walletAssets = prep.assets
+        .filter((xx) => +xx.walletBalance > 0)
+        .map((b) => {
+        var _a, _b;
+        const thePrice = b.asset === 'USDT' ? 1 : (_b = (_a = prices.find((p) => p.symbol === b.asset + 'USDT')) === null || _a === void 0 ? void 0 : _a.price) !== null && _b !== void 0 ? _b : 0;
+        return makeSpotPosition({
+            position_id: encodePath(b.asset, 'ASSET'),
+            datasource_id: 'ASTER',
+            product_id: encodePath('ASTER', 'PERP-ASSET', b.asset),
+            volume: +b.walletBalance,
+            free_volume: +b.walletBalance,
+            closable_price: +thePrice,
+        });
+    });
+    return [...positions, ...walletAssets];
 };
 //# sourceMappingURL=spot.js.map

package/dist/services/accounts/spot.js.map

@@ -1 +1 @@
-{"version":3,"file":"spot.js","sourceRoot":"","sources":["../../../src/services/accounts/spot.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAe,MAAM,uBAAuB,CAAC;AAE1F,MAAM,CAAC,MAAM,kBAAkB,GAAgD,KAAK,EAClF,UAAU,EACV,UAAU,EACV,EAAE;IACF,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC;QAC/B,mBAAmB,CAAC,UAAU,EAAE,EAAE,CAAC;KACpC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAa,EAAE;;QAChD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,0CAAE,KAAK,mCAAI,CAAC,CAAC;QAExG,OAAO,gBAAgB,CAAC;YACtB,WAAW,EAAE,CAAC,CAAC,KAAK;YACpB,aAAa,EAAE,OAAO;YACtB,UAAU,EAAE,CAAC,CAAC,KAAK;YACnB,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM;YAC3B,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;YACpB,cAAc,EAAE,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition, makeSpotPosition } from '@yuants/data-account';\nimport { getApiV1Account, getApiV1TickerPrice, ICredential } from '../../api/private-api';\n\nexport const getSpotAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (\n  credential,\n  account_id,\n) => {\n  const [x, prices] = await Promise.all([\n    getApiV1Account(credential, {}),\n    getApiV1TickerPrice(credential, {}),\n  ]);\n\n  const positions = x.balances.map((b): IPosition => {\n    const thePrice = b.asset === 'USDT' ? 1 : prices.find((p) => p.symbol === b.asset + 'USDT')?.price ?? 0;\n\n    return makeSpotPosition({\n      position_id: b.asset,\n      datasource_id: 'ASTER',\n      product_id: b.asset,\n      volume: +b.free + +b.locked,\n      free_volume: +b.free,\n      closable_price: +thePrice,\n    });\n  });\n\n  return positions;\n};\n"]}
+{"version":3,"file":"spot.js","sourceRoot":"","sources":["../../../src/services/accounts/spot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,gBAAgB,EAAe,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,UAAuB,EAAE,EAAE;IAClE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC;QAC/B,mBAAmB,CAAC,UAAU,EAAE,EAAE,CAAC;QACnC,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAa,EAAE;;QAChD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,0CAAE,KAAK,mCAAI,CAAC,CAAC;QACxG,OAAO,gBAAgB,CAAC;YACtB,WAAW,EAAE,CAAC,CAAC,KAAK;YACpB,aAAa,EAAE,OAAO;YACtB,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC;YAChD,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM;YAC3B,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;YACpB,cAAc,EAAE,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM;SAC7B,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,aAAa,GAAG,CAAC,CAAC;SACrC,GAAG,CAAC,CAAC,CAAC,EAAa,EAAE;;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,0CAAE,KAAK,mCAAI,CAAC,CAAC;QACxG,OAAO,gBAAgB,CAAC;YACtB,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC;YACzC,aAAa,EAAE,OAAO;YACtB,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC;YACtD,MAAM,EAAE,CAAC,CAAC,CAAC,aAAa;YACxB,WAAW,EAAE,CAAC,CAAC,CAAC,aAAa;YAC7B,cAAc,EAAE,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEL,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,YAAY,CAAC,CAAC;AACzC,CAAC,CAAC","sourcesContent":["import { IPosition, makeSpotPosition } from '@yuants/data-account';\nimport { getApiV1Account, getApiV1TickerPrice, getFApiV4Account, ICredential } from '../../api/private-api';\nimport { encodePath } from '@yuants/utils';\n\nexport const getSpotAccountInfo = async (credential: ICredential) => {\n  const [x, prices, prep] = await Promise.all([\n    getApiV1Account(credential, {}),\n    getApiV1TickerPrice(credential, {}),\n    getFApiV4Account(credential, {}),\n  ]);\n\n  const positions = x.balances.map((b): IPosition => {\n    const thePrice = b.asset === 'USDT' ? 1 : prices.find((p) => p.symbol === b.asset + 'USDT')?.price ?? 0;\n    return makeSpotPosition({\n      position_id: b.asset,\n      datasource_id: 'ASTER',\n      product_id: encodePath('ASTER', 'SPOT', b.asset),\n      volume: +b.free + +b.locked,\n      free_volume: +b.free,\n      closable_price: +thePrice,\n    });\n  });\n  const walletAssets = prep.assets\n    .filter((xx) => +xx.walletBalance > 0)\n    .map((b): IPosition => {\n      const thePrice = b.asset === 'USDT' ? 1 : prices.find((p) => p.symbol === b.asset + 'USDT')?.price ?? 0;\n      return makeSpotPosition({\n        position_id: encodePath(b.asset, 'ASSET'),\n        datasource_id: 'ASTER',\n        product_id: encodePath('ASTER', 'PERP-ASSET', b.asset),\n        volume: +b.walletBalance,\n        free_volume: +b.walletBalance,\n        closable_price: +thePrice,\n      });\n    });\n\n  return [...positions, ...walletAssets];\n};\n"]}

package/dist/services/exchange.js

@@ -0,0 +1,63 @@
+import { provideExchangeServices } from '@yuants/exchange';
+import { Terminal } from '@yuants/protocol';
+import { decodePath } from '@yuants/utils';
+import { listProducts } from './markets/product';
+import { getCredentialId } from './accounts/profile';
+import { getSpotAccountInfo } from './accounts/spot';
+import { listOrders, listPrepOrders, listSpotOrders } from './orders/listOrders';
+import { handleSubmitOrder } from './orders/submitOrder';
+import { getPerpAccountInfo } from './accounts/perp';
+import { handleCancelOrder } from './orders/cancelOrder';
+const terminal = Terminal.fromNodeEnv();
+provideExchangeServices(terminal, {
+    name: 'ASTER',
+    credentialSchema: {
+        type: 'object',
+        required: ['address', 'secret_key', 'api_key'],
+        properties: {
+            address: { type: 'string' },
+            secret_key: { type: 'string' },
+            api_key: { type: 'string' },
+        },
+    },
+    getCredentialId,
+    listProducts,
+    getPositions: async function (credential) {
+        const [perpPositions, spotPositions] = await Promise.all([
+            getPerpAccountInfo(credential),
+            getSpotAccountInfo(credential),
+        ]);
+        return [...perpPositions, ...spotPositions];
+    },
+    getOrders: listOrders,
+    getPositionsByProductId: async function (credential, product_id) {
+        const [_, instType] = decodePath(product_id); // ASTER/PERP/ADAUSDT
+        if (instType === 'SPOT') {
+            const positions = await getSpotAccountInfo(credential);
+            return positions.filter((position) => position.product_id === product_id);
+        }
+        if (instType === 'PERP') {
+            const positions = await getPerpAccountInfo(credential);
+            return positions.filter((position) => position.product_id === product_id);
+        }
+        throw new Error(`Unsupported instType: ${instType}`);
+    },
+    getOrdersByProductId: async function (credential, product_id) {
+        const [_, instType] = decodePath(product_id); // BITGET/USDT-FUTURES/BTCUSDT
+        if (instType === 'SPOT') {
+            const orders = await listSpotOrders(credential);
+            return orders.filter((order) => order.product_id === product_id);
+        }
+        if (instType === 'PERP') {
+            const orders = await listPrepOrders(credential);
+            return orders.filter((order) => order.product_id === product_id);
+        }
+        throw new Error(`Unsupported instType: ${instType}`);
+    },
+    submitOrder: handleSubmitOrder,
+    modifyOrder: () => {
+        throw new Error('Not implemented');
+    },
+    cancelOrder: handleCancelOrder,
+});
+//# sourceMappingURL=exchange.js.map

package/dist/services/exchange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../../src/services/exchange.ts"],"names":[],"mappings":"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","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { IOrder } from '@yuants/data-order';\nimport { provideExchangeServices } from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { decodePath } from '@yuants/utils';\nimport { listProducts } from './markets/product';\nimport { getCredentialId } from './accounts/profile';\nimport { getSpotAccountInfo } from './accounts/spot';\nimport { listOrders, listPrepOrders, listSpotOrders } from './orders/listOrders';\nimport { handleSubmitOrder } from './orders/submitOrder';\nimport { ICredential } from '../api/private-api';\nimport { getPerpAccountInfo } from './accounts/perp';\nimport { handleCancelOrder } from './orders/cancelOrder';\n\nconst terminal = Terminal.fromNodeEnv();\n\nprovideExchangeServices<ICredential>(terminal, {\n  name: 'ASTER',\n  credentialSchema: {\n    type: 'object',\n    required: ['address', 'secret_key', 'api_key'],\n    properties: {\n      address: { type: 'string' },\n      secret_key: { type: 'string' },\n      api_key: { type: 'string' },\n    },\n  },\n  getCredentialId,\n  listProducts,\n  getPositions: async function (credential: ICredential): Promise<IPosition[]> {\n    const [perpPositions, spotPositions] = await Promise.all([\n      getPerpAccountInfo(credential),\n      getSpotAccountInfo(credential),\n    ]);\n    return [...perpPositions, ...spotPositions];\n  },\n  getOrders: listOrders,\n  getPositionsByProductId: async function (\n    credential: ICredential,\n    product_id: string,\n  ): Promise<IPosition[]> {\n    const [_, instType] = decodePath(product_id); // ASTER/PERP/ADAUSDT\n    if (instType === 'SPOT') {\n      const positions = await getSpotAccountInfo(credential);\n      return positions.filter((position) => position.product_id === product_id);\n    }\n    if (instType === 'PERP') {\n      const positions = await getPerpAccountInfo(credential);\n      return positions.filter((position) => position.product_id === product_id);\n    }\n    throw new Error(`Unsupported instType: ${instType}`);\n  },\n  getOrdersByProductId: async function (credential: ICredential, product_id: string): Promise<IOrder[]> {\n    const [_, instType] = decodePath(product_id); // BITGET/USDT-FUTURES/BTCUSDT\n    if (instType === 'SPOT') {\n      const orders = await listSpotOrders(credential);\n      return orders.filter((order) => order.product_id === product_id);\n    }\n    if (instType === 'PERP') {\n      const orders = await listPrepOrders(credential);\n      return orders.filter((order) => order.product_id === product_id);\n    }\n    throw new Error(`Unsupported instType: ${instType}`);\n  },\n  submitOrder: handleSubmitOrder,\n  modifyOrder: () => {\n    throw new Error('Not implemented');\n  },\n  cancelOrder: handleCancelOrder,\n});\n"]}

package/dist/services/markets/interest_rate.js

@@ -42,7 +42,7 @@ createSeriesProvider(terminal, {
             const end = ended_at !== null && ended_at !== void 0 ? ended_at : Date.now();
             const [datasource_id, product_id] = decodePath(series_id);
             const [instType, instId] = decodePath(product_id);
-            if (instType !== 'PERPETUAL') {
+            if (instType !== 'PERP') {
                 return yield __await(void 0);
             }
             let currentStart = start;

package/dist/services/markets/interest_rate.js.map

@@ -1 +1 @@
-{"version":3,"file":"interest_rate.js","sourceRoot":"","sources":["../../../src/services/markets/interest_rate.ts"],"names":[],"mappings":"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","sourcesContent":["import { IInterestRate } from '@yuants/data-interest-rate';\nimport { IProduct } from '@yuants/data-product';\nimport { createSeriesProvider, ISeriesCollectingTask } from '@yuants/data-series';\nimport { Terminal } from '@yuants/protocol';\nimport { createSQLWriter } from '@yuants/sql';\nimport { decodePath, encodePath, formatTime } from '@yuants/utils';\nimport { firstValueFrom, map, mergeAll, timer } from 'rxjs';\nimport { getFApiV1FundingRate } from '../../api/public-api';\nimport { productService } from './product';\n\nconst terminal = Terminal.fromNodeEnv();\n\ncreateSQLWriter<ISeriesCollectingTask>(terminal, {\n  data$: productService.products$.pipe(\n    map((products: IProduct[]) => products.filter((product) => product.no_interest_rate === false)),\n    mergeAll(),\n    map(\n      (product: IProduct): ISeriesCollectingTask => ({\n        series_id: encodePath(product.datasource_id, product.product_id),\n        table_name: 'interest_rate',\n        cron_pattern: '0 * * * *',\n        cron_timezone: 'UTC',\n        disabled: false,\n        replay_count: 0,\n      }),\n    ),\n  ),\n  tableName: 'series_collecting_task',\n  writeInterval: 1000,\n  conflictKeys: ['series_id', 'table_name'],\n});\n\ncreateSeriesProvider<IInterestRate>(terminal, {\n  tableName: 'interest_rate',\n  series_id_prefix_parts: ['ASTER'],\n  reversed: true,\n  serviceOptions: { concurrent: 1 },\n  queryFn: async function* ({ series_id, started_at, ended_at }) {\n    const start = started_at ?? 0;\n    const end = ended_at ?? Date.now();\n    const [datasource_id, product_id] = decodePath(series_id);\n    const [instType, instId] = decodePath(product_id);\n\n    if (instType !== 'PERPETUAL') {\n      return;\n    }\n\n    let currentStart = start;\n\n    while (currentStart <= end) {\n      const res = await getFApiV1FundingRate({\n        symbol: instId,\n        startTime: currentStart,\n        endTime: end,\n        limit: 1000,\n      });\n\n      if (!Array.isArray(res) || res.length === 0) {\n        break;\n      }\n\n      const filtered = res.filter((item) => item.fundingTime >= currentStart && item.fundingTime <= end);\n\n      if (filtered.length === 0) {\n        const lastRecord = res[res.length - 1];\n        const nextStart = lastRecord.fundingTime + 1;\n        if (nextStart <= currentStart) {\n          break;\n        }\n        currentStart = nextStart;\n        await firstValueFrom(timer(1000));\n        continue;\n      }\n\n      const data = filtered.map((item): IInterestRate => {\n        const rate = Number(item.fundingRate);\n        return {\n          series_id,\n          product_id,\n          datasource_id,\n          created_at: formatTime(item.fundingTime),\n          long_rate: `${-rate}`,\n          short_rate: `${rate}`,\n          settlement_price: '',\n        };\n      });\n\n      yield data;\n\n      const lastTime = filtered[filtered.length - 1].fundingTime;\n      if (lastTime >= end) {\n        break;\n      }\n\n      currentStart = lastTime + 1;\n\n      if (res.length < 1000) {\n        break;\n      }\n\n      await firstValueFrom(timer(1000));\n    }\n  },\n});\n"]}
+{"version":3,"file":"interest_rate.js","sourceRoot":"","sources":["../../../src/services/markets/interest_rate.ts"],"names":[],"mappings":"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","sourcesContent":["import { IInterestRate } from '@yuants/data-interest-rate';\nimport { IProduct } from '@yuants/data-product';\nimport { createSeriesProvider, ISeriesCollectingTask } from '@yuants/data-series';\nimport { Terminal } from '@yuants/protocol';\nimport { createSQLWriter } from '@yuants/sql';\nimport { decodePath, encodePath, formatTime } from '@yuants/utils';\nimport { firstValueFrom, map, mergeAll, timer } from 'rxjs';\nimport { getFApiV1FundingRate } from '../../api/public-api';\nimport { productService } from './product';\n\nconst terminal = Terminal.fromNodeEnv();\n\ncreateSQLWriter<ISeriesCollectingTask>(terminal, {\n  data$: productService.products$.pipe(\n    map((products: IProduct[]) => products.filter((product) => product.no_interest_rate === false)),\n    mergeAll(),\n    map(\n      (product: IProduct): ISeriesCollectingTask => ({\n        series_id: encodePath(product.datasource_id, product.product_id),\n        table_name: 'interest_rate',\n        cron_pattern: '0 * * * *',\n        cron_timezone: 'UTC',\n        disabled: false,\n        replay_count: 0,\n      }),\n    ),\n  ),\n  tableName: 'series_collecting_task',\n  writeInterval: 1000,\n  conflictKeys: ['series_id', 'table_name'],\n});\n\ncreateSeriesProvider<IInterestRate>(terminal, {\n  tableName: 'interest_rate',\n  series_id_prefix_parts: ['ASTER'],\n  reversed: true,\n  serviceOptions: { concurrent: 1 },\n  queryFn: async function* ({ series_id, started_at, ended_at }) {\n    const start = started_at ?? 0;\n    const end = ended_at ?? Date.now();\n    const [datasource_id, product_id] = decodePath(series_id);\n    const [instType, instId] = decodePath(product_id);\n\n    if (instType !== 'PERP') {\n      return;\n    }\n\n    let currentStart = start;\n\n    while (currentStart <= end) {\n      const res = await getFApiV1FundingRate({\n        symbol: instId,\n        startTime: currentStart,\n        endTime: end,\n        limit: 1000,\n      });\n\n      if (!Array.isArray(res) || res.length === 0) {\n        break;\n      }\n\n      const filtered = res.filter((item) => item.fundingTime >= currentStart && item.fundingTime <= end);\n\n      if (filtered.length === 0) {\n        const lastRecord = res[res.length - 1];\n        const nextStart = lastRecord.fundingTime + 1;\n        if (nextStart <= currentStart) {\n          break;\n        }\n        currentStart = nextStart;\n        await firstValueFrom(timer(1000));\n        continue;\n      }\n\n      const data = filtered.map((item): IInterestRate => {\n        const rate = Number(item.fundingRate);\n        return {\n          series_id,\n          product_id,\n          datasource_id,\n          created_at: formatTime(item.fundingTime),\n          long_rate: `${-rate}`,\n          short_rate: `${rate}`,\n          settlement_price: '',\n        };\n      });\n\n      yield data;\n\n      const lastTime = filtered[filtered.length - 1].fundingTime;\n      if (lastTime >= end) {\n        break;\n      }\n\n      currentStart = lastTime + 1;\n\n      if (res.length < 1000) {\n        break;\n      }\n\n      await firstValueFrom(timer(1000));\n    }\n  },\n});\n"]}

package/dist/services/markets/product.js

@@ -3,8 +3,7 @@ import { Terminal } from '@yuants/protocol';
 import { encodePath } from '@yuants/utils';
 import { getFApiV1ExchangeInfo } from '../../api/public-api';
 const terminal = Terminal.fromNodeEnv();
-// Provide QueryProducts service for ASTER
-export const productService = provideQueryProductsService(terminal, 'ASTER', async (req) => {
+export const listProducts = async () => {
     // Fetch exchange info from ASTER API
     const exchangeInfo = await getFApiV1ExchangeInfo({});
     // Convert symbols to IProduct format
@@ -19,7 +18,7 @@ export const productService = provideQueryProductsService(terminal, 'ASTER', asy
         const volumeStep = lotSizeFilter ? +lotSizeFilter.stepSize : Number(`1e-${symbol.quantityPrecision}`);
         return {
             datasource_id: 'ASTER',
-            product_id: encodePath('PERPETUAL', symbol.symbol),
+            product_id: encodePath('ASTER', 'PERP', symbol.symbol),
             name: `${symbol.baseAsset}/${symbol.quoteAsset} PERP`,
             quote_currency: symbol.quoteAsset,
             base_currency: symbol.baseAsset,
@@ -38,7 +37,9 @@ export const productService = provideQueryProductsService(terminal, 'ASTER', asy
             no_interest_rate: false,
         };
     });
-}, {
+};
+// Provide QueryProducts service for ASTER
+export const productService = provideQueryProductsService(terminal, 'ASTER', listProducts, {
     auto_refresh_interval: 3600000, // Refresh hourly
 });
 //# sourceMappingURL=product.js.map

package/dist/services/markets/product.js.map

@@ -1 +1 @@
-{"version":3,"file":"product.js","sourceRoot":"","sources":["../../../src/services/markets/product.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,0CAA0C;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG,2BAA2B,CACvD,QAAQ,EACR,OAAO,EACP,KAAK,EAAE,GAA0B,EAAuB,EAAE;IACxD,qCAAqC;IACrC,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,EAAE,CAAC,CAAC;IAErD,qCAAqC;IACrC,OAAO,YAAY,CAAC,OAAO;SACxB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,sCAAsC;SACtF,GAAG,CAAC,CAAC,MAAM,EAAY,EAAE;QACxB,mCAAmC;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,cAAc,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QAE7D,uCAAuC;QACvC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QACxF,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAEtG,OAAO;YACL,aAAa,EAAE,OAAO;YACtB,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC;YAClD,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,OAAO;YACrD,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,aAAa,EAAE,MAAM,CAAC,SAAS;YAC/B,gBAAgB,EAAE,EAAE;YACpB,gBAAgB,EAAE,CAAC;YACnB,iBAAiB,EAAE,CAAC;YACpB,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,UAAU;YACvB,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,GAAG;YAChB,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,iBAAiB;YAC5B,gBAAgB,EAAE,KAAK;SACxB,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,EACD;IACE,qBAAqB,EAAE,OAAQ,EAAE,iBAAiB;CACnD,CACF,CAAC","sourcesContent":["import { IProduct, IQueryProductsRequest, provideQueryProductsService } from '@yuants/data-product';\nimport { Terminal } from '@yuants/protocol';\nimport { encodePath } from '@yuants/utils';\nimport { getFApiV1ExchangeInfo } from '../../api/public-api';\n\nconst terminal = Terminal.fromNodeEnv();\n\n// Provide QueryProducts service for ASTER\nexport const productService = provideQueryProductsService(\n  terminal,\n  'ASTER',\n  async (req: IQueryProductsRequest): Promise<IProduct[]> => {\n    // Fetch exchange info from ASTER API\n    const exchangeInfo = await getFApiV1ExchangeInfo({});\n\n    // Convert symbols to IProduct format\n    return exchangeInfo.symbols\n      .filter((symbol) => symbol.status === 'TRADING') // Only include active trading symbols\n      .map((symbol): IProduct => {\n        // Find price filter for price step\n        const priceFilter = symbol.filters.find((filter) => filter.filterType === 'PRICE_FILTER');\n        const priceStep = priceFilter ? +priceFilter.tickSize : 1e-2;\n\n        // Find lot size filter for volume step\n        const lotSizeFilter = symbol.filters.find((filter) => filter.filterType === 'LOT_SIZE');\n        const volumeStep = lotSizeFilter ? +lotSizeFilter.stepSize : Number(`1e-${symbol.quantityPrecision}`);\n\n        return {\n          datasource_id: 'ASTER',\n          product_id: encodePath('PERPETUAL', symbol.symbol),\n          name: `${symbol.baseAsset}/${symbol.quoteAsset} PERP`,\n          quote_currency: symbol.quoteAsset,\n          base_currency: symbol.baseAsset,\n          value_scale_unit: '',\n          value_based_cost: 0,\n          volume_based_cost: 0,\n          max_volume: 0,\n          price_step: priceStep,\n          volume_step: volumeStep,\n          value_scale: 1,\n          allow_long: true,\n          allow_short: true,\n          margin_rate: 0.1, // Default margin rate, can be adjusted based on actual requirements\n          max_position: 0,\n          market_id: 'ASTER/PERPETUAL',\n          no_interest_rate: false,\n        };\n      });\n  },\n  {\n    auto_refresh_interval: 3600_000, // Refresh hourly\n  },\n);\n"]}
+{"version":3,"file":"product.js","sourceRoot":"","sources":["../../../src/services/markets/product.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,IAAyB,EAAE;IAC1D,qCAAqC;IACrC,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACrD,qCAAqC;IACrC,OAAO,YAAY,CAAC,OAAO;SACxB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,sCAAsC;SACtF,GAAG,CAAC,CAAC,MAAM,EAAY,EAAE;QACxB,mCAAmC;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,cAAc,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QAE7D,uCAAuC;QACvC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QACxF,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAEtG,OAAO;YACL,aAAa,EAAE,OAAO;YACtB,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;YACtD,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,OAAO;YACrD,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,aAAa,EAAE,MAAM,CAAC,SAAS;YAC/B,gBAAgB,EAAE,EAAE;YACpB,gBAAgB,EAAE,CAAC;YACnB,iBAAiB,EAAE,CAAC;YACpB,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,UAAU;YACvB,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,GAAG;YAChB,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,iBAAiB;YAC5B,gBAAgB,EAAE,KAAK;SACxB,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG,2BAA2B,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;IACzF,qBAAqB,EAAE,OAAQ,EAAE,iBAAiB;CACnD,CAAC,CAAC","sourcesContent":["import { IProduct, IQueryProductsRequest, provideQueryProductsService } from '@yuants/data-product';\nimport { Terminal } from '@yuants/protocol';\nimport { encodePath } from '@yuants/utils';\nimport { getFApiV1ExchangeInfo } from '../../api/public-api';\n\nconst terminal = Terminal.fromNodeEnv();\n\nexport const listProducts = async (): Promise<IProduct[]> => {\n  // Fetch exchange info from ASTER API\n  const exchangeInfo = await getFApiV1ExchangeInfo({});\n  // Convert symbols to IProduct format\n  return exchangeInfo.symbols\n    .filter((symbol) => symbol.status === 'TRADING') // Only include active trading symbols\n    .map((symbol): IProduct => {\n      // Find price filter for price step\n      const priceFilter = symbol.filters.find((filter) => filter.filterType === 'PRICE_FILTER');\n      const priceStep = priceFilter ? +priceFilter.tickSize : 1e-2;\n\n      // Find lot size filter for volume step\n      const lotSizeFilter = symbol.filters.find((filter) => filter.filterType === 'LOT_SIZE');\n      const volumeStep = lotSizeFilter ? +lotSizeFilter.stepSize : Number(`1e-${symbol.quantityPrecision}`);\n\n      return {\n        datasource_id: 'ASTER',\n        product_id: encodePath('ASTER', 'PERP', symbol.symbol),\n        name: `${symbol.baseAsset}/${symbol.quoteAsset} PERP`,\n        quote_currency: symbol.quoteAsset,\n        base_currency: symbol.baseAsset,\n        value_scale_unit: '',\n        value_based_cost: 0,\n        volume_based_cost: 0,\n        max_volume: 0,\n        price_step: priceStep,\n        volume_step: volumeStep,\n        value_scale: 1,\n        allow_long: true,\n        allow_short: true,\n        margin_rate: 0.1, // Default margin rate, can be adjusted based on actual requirements\n        max_position: 0,\n        market_id: 'ASTER/PERPETUAL',\n        no_interest_rate: false,\n      };\n    });\n};\n\n// Provide QueryProducts service for ASTER\nexport const productService = provideQueryProductsService(terminal, 'ASTER', listProducts, {\n  auto_refresh_interval: 3600_000, // Refresh hourly\n});\n"]}

package/dist/services/markets/quote.js

@@ -20,7 +20,7 @@ const quote$ = defer(() => getFApiV1TickerPrice({})).pipe(mergeMap((tickers) =>
     var _a;
     return ({
         datasource_id: 'ASTER',
-        product_id: encodePath('PERPETUAL', ticker.symbol),
+        product_id: encodePath('PERP', ticker.symbol),
         last_price: `${ticker.price}`,
         bid_price: `${ticker.price}`,
         ask_price: `${ticker.price}`,

package/dist/services/markets/quote.js.map

@@ -1 +1 @@
-{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../src/services/markets/quote.ts"],"names":[],"mappings":"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","sourcesContent":["import { createCache } from '@yuants/cache';\nimport type { IQuote } from '@yuants/data-quote';\nimport { Terminal } from '@yuants/protocol';\nimport { writeToSQL } from '@yuants/sql';\nimport { decodePath, encodePath } from '@yuants/utils';\nimport { defer, filter, from, map, mergeMap, repeat, retry, shareReplay } from 'rxjs';\nimport { getFApiV1OpenInterest, getFApiV1TickerPrice } from '../../api/public-api';\n\nconst terminal = Terminal.fromNodeEnv();\nconst OPEN_INTEREST_TTL = process.env.OPEN_INTEREST_TTL ? Number(process.env.OPEN_INTEREST_TTL) : 120_000;\n\nconst openInterestCache = createCache<string>(\n  async (symbol: string) => {\n    try {\n      const data = await getFApiV1OpenInterest({ symbol });\n      return data.openInterest;\n    } catch (error) {\n      console.warn('getFApiV1OpenInterest failed', symbol, error);\n      return undefined;\n    }\n  },\n  { expire: OPEN_INTEREST_TTL },\n);\n\nconst quote$ = defer(() => getFApiV1TickerPrice({})).pipe(\n  mergeMap((tickers) => tickers || []),\n  mergeMap(\n    (ticker) =>\n      from(openInterestCache.query(ticker.symbol)).pipe(\n        map(\n          (openInterest): Partial<IQuote> => ({\n            datasource_id: 'ASTER',\n            product_id: encodePath('PERPETUAL', ticker.symbol),\n            last_price: `${ticker.price}`,\n            bid_price: `${ticker.price}`,\n            ask_price: `${ticker.price}`,\n            open_interest: `${openInterest ?? 0}`,\n            updated_at: new Date(ticker.time ?? Date.now()).toISOString(),\n          }),\n        ),\n      ),\n    5,\n  ),\n  repeat({ delay: 1000 }),\n  retry({ delay: 5000 }),\n  shareReplay({ bufferSize: 1, refCount: true }),\n);\n\nif (process.env.WRITE_QUOTE_TO_SQL === 'true') {\n  quote$\n    .pipe(\n      writeToSQL({\n        terminal,\n        tableName: 'quote',\n        writeInterval: 1000,\n        conflictKeys: ['datasource_id', 'product_id'],\n      }),\n    )\n    .subscribe();\n\n  terminal.channel.publishChannel('quote', { pattern: '^ASTER/' }, (channel_id) => {\n    const [datasourceId, productId] = decodePath(channel_id);\n    if (!datasourceId || !productId) {\n      throw new Error(`Invalid channel_id: ${channel_id}`);\n    }\n    return quote$.pipe(filter((quote) => quote.product_id === productId));\n  });\n}\n"]}
+{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../src/services/markets/quote.ts"],"names":[],"mappings":"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","sourcesContent":["import { createCache } from '@yuants/cache';\nimport type { IQuote } from '@yuants/data-quote';\nimport { Terminal } from '@yuants/protocol';\nimport { writeToSQL } from '@yuants/sql';\nimport { decodePath, encodePath } from '@yuants/utils';\nimport { defer, filter, from, map, mergeMap, repeat, retry, shareReplay } from 'rxjs';\nimport { getFApiV1OpenInterest, getFApiV1TickerPrice } from '../../api/public-api';\n\nconst terminal = Terminal.fromNodeEnv();\nconst OPEN_INTEREST_TTL = process.env.OPEN_INTEREST_TTL ? Number(process.env.OPEN_INTEREST_TTL) : 120_000;\n\nconst openInterestCache = createCache<string>(\n  async (symbol: string) => {\n    try {\n      const data = await getFApiV1OpenInterest({ symbol });\n      return data.openInterest;\n    } catch (error) {\n      console.warn('getFApiV1OpenInterest failed', symbol, error);\n      return undefined;\n    }\n  },\n  { expire: OPEN_INTEREST_TTL },\n);\n\nconst quote$ = defer(() => getFApiV1TickerPrice({})).pipe(\n  mergeMap((tickers) => tickers || []),\n  mergeMap(\n    (ticker) =>\n      from(openInterestCache.query(ticker.symbol)).pipe(\n        map(\n          (openInterest): Partial<IQuote> => ({\n            datasource_id: 'ASTER',\n            product_id: encodePath('PERP', ticker.symbol),\n            last_price: `${ticker.price}`,\n            bid_price: `${ticker.price}`,\n            ask_price: `${ticker.price}`,\n            open_interest: `${openInterest ?? 0}`,\n            updated_at: new Date(ticker.time ?? Date.now()).toISOString(),\n          }),\n        ),\n      ),\n    5,\n  ),\n  repeat({ delay: 1000 }),\n  retry({ delay: 5000 }),\n  shareReplay({ bufferSize: 1, refCount: true }),\n);\n\nif (process.env.WRITE_QUOTE_TO_SQL === 'true') {\n  quote$\n    .pipe(\n      writeToSQL({\n        terminal,\n        tableName: 'quote',\n        writeInterval: 1000,\n        conflictKeys: ['datasource_id', 'product_id'],\n      }),\n    )\n    .subscribe();\n\n  terminal.channel.publishChannel('quote', { pattern: '^ASTER/' }, (channel_id) => {\n    const [datasourceId, productId] = decodePath(channel_id);\n    if (!datasourceId || !productId) {\n      throw new Error(`Invalid channel_id: ${channel_id}`);\n    }\n    return quote$.pipe(filter((quote) => quote.product_id === productId));\n  });\n}\n"]}

package/dist/services/orders/cancelOrder.js

@@ -11,26 +11,23 @@ const parseProductId = (productId) => {
     return { category: undefined, symbol: parts[0] };
 };
 export const handleCancelOrder = async (credential, order) => {
-    var _a, _b;
     if (!order.order_id) {
         throw new Error('order_id is required for CancelOrder');
     }
-    const { category, symbol } = parseProductId(order.product_id);
+    const [_, instType, symbol] = decodePath(order.product_id); // BITGET/USDT-FUTURES/BTCUSDT
     if (!symbol) {
         throw new Error('product_id is required to resolve symbol for CancelOrder');
     }
-    const accountId = (_b = (_a = order.account_id) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : order.account_id;
-    const productType = category === null || category === void 0 ? void 0 : category.toUpperCase();
-    if ((accountId === null || accountId === void 0 ? void 0 : accountId.includes('/SPOT')) || productType === 'SPOT') {
+    if (instType === 'SPOT') {
         await deleteApiV1Order(credential, {
             symbol,
             orderId: order.order_id,
         });
         return;
     }
-    if ((accountId === null || accountId === void 0 ? void 0 : accountId.includes('/PERP')) || productType === 'PERPETUAL') {
+    if (instType === 'PERP') {
         await deleteFApiV1Order(credential, {
-            symbol,
+            symbol: decodePath(order.product_id).slice(2).join('/'),
             orderId: order.order_id,
         });
         return;

package/dist/services/orders/cancelOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancelOrder.js","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAe,MAAM,uBAAuB,CAAC;AAEzF,MAAM,cAAc,GAAG,CAAC,SAAkB,EAAE,EAAE;IAC5C,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,QAAQ,EAAE,SAA+B,EAAE,MAAM,EAAE,SAA+B,EAAE,CAAC;KAC/F;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KACjE;IACD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;;IACrG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IAED,MAAM,SAAS,GAAG,MAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,WAAW,EAAE,mCAAI,KAAK,CAAC,UAAU,CAAC;IACtE,MAAM,WAAW,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,EAAE,CAAC;IAE5C,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,KAAI,WAAW,KAAK,MAAM,EAAE;QAC1D,MAAM,gBAAgB,CAAC,UAAU,EAAE;YACjC,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO;KACR;IAED,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,KAAI,WAAW,KAAK,WAAW,EAAE;QAC/D,MAAM,iBAAiB,CAAC,UAAU,EAAE;YAClC,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO;KACR;IAED,MAAM,IAAI,KAAK,CAAC,mDAAmD,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;AACzF,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfCancelOrder } from '@yuants/data-order';\nimport { decodePath } from '@yuants/utils';\nimport { deleteApiV1Order, deleteFApiV1Order, ICredential } from '../../api/private-api';\n\nconst parseProductId = (productId?: string) => {\n  if (!productId) {\n    return { category: undefined as string | undefined, symbol: undefined as string | undefined };\n  }\n  const parts = decodePath(productId);\n  if (parts.length >= 2) {\n    return { category: parts[0], symbol: parts.slice(1).join('/') };\n  }\n  return { category: undefined, symbol: parts[0] };\n};\n\nexport const handleCancelOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('order_id is required for CancelOrder');\n  }\n\n  const { category, symbol } = parseProductId(order.product_id);\n  if (!symbol) {\n    throw new Error('product_id is required to resolve symbol for CancelOrder');\n  }\n\n  const accountId = order.account_id?.toUpperCase() ?? order.account_id;\n  const productType = category?.toUpperCase();\n\n  if (accountId?.includes('/SPOT') || productType === 'SPOT') {\n    await deleteApiV1Order(credential, {\n      symbol,\n      orderId: order.order_id,\n    });\n    return;\n  }\n\n  if (accountId?.includes('/PERP') || productType === 'PERPETUAL') {\n    await deleteFApiV1Order(credential, {\n      symbol,\n      orderId: order.order_id,\n    });\n    return;\n  }\n\n  throw new Error(`Unsupported account_id/product for CancelOrder: ${order.account_id}`);\n};\n"]}
+{"version":3,"file":"cancelOrder.js","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAe,MAAM,uBAAuB,CAAC;AAEzF,MAAM,cAAc,GAAG,CAAC,SAAkB,EAAE,EAAE;IAC5C,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,QAAQ,EAAE,SAA+B,EAAE,MAAM,EAAE,SAA+B,EAAE,CAAC;KAC/F;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KACjE;IACD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IACrG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IACD,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,8BAA8B;IAC1F,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IACD,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,MAAM,gBAAgB,CAAC,UAAU,EAAE;YACjC,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO;KACR;IACD,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,MAAM,iBAAiB,CAAC,UAAU,EAAE;YAClC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACvD,OAAO,EAAE,KAAK,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO;KACR;IAED,MAAM,IAAI,KAAK,CAAC,mDAAmD,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;AACzF,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfCancelOrder } from '@yuants/data-order';\nimport { decodePath } from '@yuants/utils';\nimport { deleteApiV1Order, deleteFApiV1Order, ICredential } from '../../api/private-api';\n\nconst parseProductId = (productId?: string) => {\n  if (!productId) {\n    return { category: undefined as string | undefined, symbol: undefined as string | undefined };\n  }\n  const parts = decodePath(productId);\n  if (parts.length >= 2) {\n    return { category: parts[0], symbol: parts.slice(1).join('/') };\n  }\n  return { category: undefined, symbol: parts[0] };\n};\n\nexport const handleCancelOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('order_id is required for CancelOrder');\n  }\n  const [_, instType, symbol] = decodePath(order.product_id); // BITGET/USDT-FUTURES/BTCUSDT\n  if (!symbol) {\n    throw new Error('product_id is required to resolve symbol for CancelOrder');\n  }\n  if (instType === 'SPOT') {\n    await deleteApiV1Order(credential, {\n      symbol,\n      orderId: order.order_id,\n    });\n    return;\n  }\n  if (instType === 'PERP') {\n    await deleteFApiV1Order(credential, {\n      symbol: decodePath(order.product_id).slice(2).join('/'),\n      orderId: order.order_id,\n    });\n    return;\n  }\n\n  throw new Error(`Unsupported account_id/product for CancelOrder: ${order.account_id}`);\n};\n"]}

package/dist/services/orders/listOrders.js

@@ -16,7 +16,7 @@ const resolvePerpOrderDirection = (asterOrder) => {
 const resolveSpotOrderDirection = (side) => {
     return side === 'SELL' ? 'CLOSE_LONG' : 'OPEN_LONG';
 };
-const mapPerpOrder = (order, account_id) => {
+export const mapPerpOrder = (order, account_id) => {
     const volume = Number(order.origQty);
     const tradedVolume = Number(order.executedQty);
     const price = Number(order.price);
@@ -24,7 +24,7 @@ const mapPerpOrder = (order, account_id) => {
     return {
         order_id: `${order.orderId}`,
         account_id,
-        product_id: encodePath('PERPETUAL', order.symbol),
+        product_id: encodePath('ASTER', 'PERP', order.symbol),
         order_type: order.type,
         order_direction: resolvePerpOrderDirection(order),
         volume: Number.isFinite(volume) ? volume : 0,
@@ -35,7 +35,7 @@ const mapPerpOrder = (order, account_id) => {
         order_status: order.status,
     };
 };
-const mapSpotOrder = (order, account_id) => {
+export const mapSpotOrder = (order, account_id) => {
     var _a, _b;
     const volume = Number(order.origQty);
     const tradedVolume = Number(order.executedQty);
@@ -44,7 +44,7 @@ const mapSpotOrder = (order, account_id) => {
     return {
         order_id: `${order.orderId}`,
         account_id,
-        product_id: encodePath('SPOT', order.symbol),
+        product_id: encodePath('ASTER', 'SPOT', order.symbol),
         order_type: order.type,
         order_direction: resolveSpotOrderDirection(order.side),
         volume: Number.isFinite(volume) ? volume : 0,
@@ -55,13 +55,22 @@ const mapSpotOrder = (order, account_id) => {
         order_status: order.status,
     };
 };
-const isSpotAccount = (account_id) => account_id.endsWith('/SPOT');
-export const listOrders = async (credential, account_id) => {
-    if (isSpotAccount(account_id)) {
-        const orders = await getApiV1OpenOrders(credential, {});
-        return orders.map((order) => mapSpotOrder(order, account_id));
-    }
-    const orders = await getFApiV1OpenOrders(credential, {});
-    return orders.map((order) => mapPerpOrder(order, account_id));
+export const listOrders = async (credential) => {
+    const [prepOrders, spotOrders] = await Promise.all([
+        getFApiV1OpenOrders(credential, {}),
+        getApiV1OpenOrders(credential, {}),
+    ]);
+    return [
+        ...prepOrders.map((order) => mapPerpOrder(order, '')),
+        ...spotOrders.map((order) => mapSpotOrder(order, '')),
+    ];
+};
+export const listSpotOrders = async (credential) => {
+    const [spotOrders] = await Promise.all([getApiV1OpenOrders(credential, {})]);
+    return [...spotOrders.map((order) => mapSpotOrder(order, ''))];
+};
+export const listPrepOrders = async (credential) => {
+    const [prepOrders] = await Promise.all([getFApiV1OpenOrders(credential, {})]);
+    return [...prepOrders.map((order) => mapPerpOrder(order, ''))];
 };
 //# sourceMappingURL=listOrders.js.map

package/dist/services/orders/listOrders.js.map

@@ -1 +1 @@
-{"version":3,"file":"listOrders.js","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfListOrders, IOrder } from '@yuants/data-order';\nimport {\n  getApiV1OpenOrders,\n  getFApiV1OpenOrders,\n  IAsterFutureOpenOrder,\n  IAsterSpotOpenOrder,\n  ICredential,\n} from '../../api/private-api';\nimport { encodePath } from '@yuants/utils';\n\ntype OrderDirection = 'OPEN_LONG' | 'OPEN_SHORT' | 'CLOSE_LONG' | 'CLOSE_SHORT';\n\nconst resolvePerpOrderDirection = (asterOrder: IAsterFutureOpenOrder): OrderDirection => {\n  const reduceOnly = asterOrder.reduceOnly || asterOrder.closePosition;\n\n  if (asterOrder.positionSide === 'LONG') {\n    return asterOrder.side === 'BUY' ? 'OPEN_LONG' : 'CLOSE_LONG';\n  }\n  if (asterOrder.positionSide === 'SHORT') {\n    return asterOrder.side === 'BUY' ? 'CLOSE_SHORT' : 'OPEN_SHORT';\n  }\n  if (reduceOnly) {\n    return asterOrder.side === 'BUY' ? 'CLOSE_SHORT' : 'CLOSE_LONG';\n  }\n  return asterOrder.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT';\n};\n\nconst resolveSpotOrderDirection = (side: 'BUY' | 'SELL'): OrderDirection => {\n  return side === 'SELL' ? 'CLOSE_LONG' : 'OPEN_LONG';\n};\n\nconst mapPerpOrder = (order: IAsterFutureOpenOrder, account_id: string): IOrder => {\n  const volume = Number(order.origQty);\n  const tradedVolume = Number(order.executedQty);\n  const price = Number(order.price);\n  const avgPrice = Number(order.avgPrice);\n\n  return {\n    order_id: `${order.orderId}`,\n    account_id,\n    product_id: encodePath('PERPETUAL', order.symbol),\n    order_type: order.type,\n    order_direction: resolvePerpOrderDirection(order),\n    volume: Number.isFinite(volume) ? volume : 0,\n    price: Number.isFinite(price) ? price : undefined,\n    submit_at: order.updateTime,\n    traded_volume: Number.isFinite(tradedVolume) ? tradedVolume : undefined,\n    traded_price: Number.isFinite(avgPrice) && avgPrice > 0 ? avgPrice : undefined,\n    order_status: order.status,\n  };\n};\n\nconst mapSpotOrder = (order: IAsterSpotOpenOrder, account_id: string): IOrder => {\n  const volume = Number(order.origQty);\n  const tradedVolume = Number(order.executedQty);\n  const price = Number(order.price);\n  const avgPrice = Number(order.avgPrice ?? order.price);\n\n  return {\n    order_id: `${order.orderId}`,\n    account_id,\n    product_id: encodePath('SPOT', order.symbol),\n    order_type: order.type,\n    order_direction: resolveSpotOrderDirection(order.side),\n    volume: Number.isFinite(volume) ? volume : 0,\n    price: Number.isFinite(price) ? price : undefined,\n    submit_at: order.updateTime ?? order.time,\n    traded_volume: Number.isFinite(tradedVolume) ? tradedVolume : undefined,\n    traded_price: Number.isFinite(avgPrice) && avgPrice > 0 ? avgPrice : undefined,\n    order_status: order.status,\n  };\n};\n\nconst isSpotAccount = (account_id: string) => account_id.endsWith('/SPOT');\n\nexport const listOrders: IActionHandlerOfListOrders<ICredential> = async (credential, account_id) => {\n  if (isSpotAccount(account_id)) {\n    const orders = await getApiV1OpenOrders(credential, {});\n    return orders.map((order) => mapSpotOrder(order, account_id));\n  }\n\n  const orders = await getFApiV1OpenOrders(credential, {});\n  return orders.map((order) => mapPerpOrder(order, account_id));\n};\n"]}
+{"version":3,"file":"listOrders.js","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfListOrders, IOrder } from '@yuants/data-order';\nimport {\n  getApiV1OpenOrders,\n  getFApiV1OpenOrders,\n  IAsterFutureOpenOrder,\n  IAsterSpotOpenOrder,\n  ICredential,\n} from '../../api/private-api';\nimport { encodePath } from '@yuants/utils';\n\ntype OrderDirection = 'OPEN_LONG' | 'OPEN_SHORT' | 'CLOSE_LONG' | 'CLOSE_SHORT';\n\nconst resolvePerpOrderDirection = (asterOrder: IAsterFutureOpenOrder): OrderDirection => {\n  const reduceOnly = asterOrder.reduceOnly || asterOrder.closePosition;\n\n  if (asterOrder.positionSide === 'LONG') {\n    return asterOrder.side === 'BUY' ? 'OPEN_LONG' : 'CLOSE_LONG';\n  }\n  if (asterOrder.positionSide === 'SHORT') {\n    return asterOrder.side === 'BUY' ? 'CLOSE_SHORT' : 'OPEN_SHORT';\n  }\n  if (reduceOnly) {\n    return asterOrder.side === 'BUY' ? 'CLOSE_SHORT' : 'CLOSE_LONG';\n  }\n  return asterOrder.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT';\n};\n\nconst resolveSpotOrderDirection = (side: 'BUY' | 'SELL'): OrderDirection => {\n  return side === 'SELL' ? 'CLOSE_LONG' : 'OPEN_LONG';\n};\n\nexport const mapPerpOrder = (order: IAsterFutureOpenOrder, account_id: string): IOrder => {\n  const volume = Number(order.origQty);\n  const tradedVolume = Number(order.executedQty);\n  const price = Number(order.price);\n  const avgPrice = Number(order.avgPrice);\n\n  return {\n    order_id: `${order.orderId}`,\n    account_id,\n    product_id: encodePath('ASTER', 'PERP', order.symbol),\n    order_type: order.type,\n    order_direction: resolvePerpOrderDirection(order),\n    volume: Number.isFinite(volume) ? volume : 0,\n    price: Number.isFinite(price) ? price : undefined,\n    submit_at: order.updateTime,\n    traded_volume: Number.isFinite(tradedVolume) ? tradedVolume : undefined,\n    traded_price: Number.isFinite(avgPrice) && avgPrice > 0 ? avgPrice : undefined,\n    order_status: order.status,\n  };\n};\n\nexport const mapSpotOrder = (order: IAsterSpotOpenOrder, account_id: string): IOrder => {\n  const volume = Number(order.origQty);\n  const tradedVolume = Number(order.executedQty);\n  const price = Number(order.price);\n  const avgPrice = Number(order.avgPrice ?? order.price);\n\n  return {\n    order_id: `${order.orderId}`,\n    account_id,\n    product_id: encodePath('ASTER', 'SPOT', order.symbol),\n    order_type: order.type,\n    order_direction: resolveSpotOrderDirection(order.side),\n    volume: Number.isFinite(volume) ? volume : 0,\n    price: Number.isFinite(price) ? price : undefined,\n    submit_at: order.updateTime ?? order.time,\n    traded_volume: Number.isFinite(tradedVolume) ? tradedVolume : undefined,\n    traded_price: Number.isFinite(avgPrice) && avgPrice > 0 ? avgPrice : undefined,\n    order_status: order.status,\n  };\n};\n\nexport const listOrders = async (credential: ICredential) => {\n  const [prepOrders, spotOrders] = await Promise.all([\n    getFApiV1OpenOrders(credential, {}),\n    getApiV1OpenOrders(credential, {}),\n  ]);\n  return [\n    ...prepOrders.map((order) => mapPerpOrder(order, '')),\n    ...spotOrders.map((order) => mapSpotOrder(order, '')),\n  ];\n};\n\nexport const listSpotOrders = async (credential: ICredential) => {\n  const [spotOrders] = await Promise.all([getApiV1OpenOrders(credential, {})]);\n  return [...spotOrders.map((order) => mapSpotOrder(order, ''))];\n};\n\nexport const listPrepOrders = async (credential: ICredential) => {\n  const [prepOrders] = await Promise.all([getFApiV1OpenOrders(credential, {})]);\n  return [...prepOrders.map((order) => mapPerpOrder(order, ''))];\n};\n"]}

package/dist/services/orders/submitOrder.js

@@ -86,14 +86,11 @@ const handleSubmitOrderOfPerp = async (credential, order) => {
     return { order_id: `${orderId}` };
 };
 export const handleSubmitOrder = async (credential, order) => {
-    var _a, _b;
-    const accountId = (_b = (_a = order.account_id) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : order.account_id;
-    const { category } = parseProductId(order.product_id);
-    const productType = category === null || category === void 0 ? void 0 : category.toUpperCase();
-    if ((accountId === null || accountId === void 0 ? void 0 : accountId.includes('/SPOT')) || productType === 'SPOT') {
+    const [_, instType] = decodePath(order.product_id); // BITGET/USDT-FUTURES/BTCUSDT
+    if (instType === 'SPOT') {
         return handleSubmitOrderOfSpot(credential, order);
     }
-    if ((accountId === null || accountId === void 0 ? void 0 : accountId.includes('/PERP')) || productType === 'PERPETUAL') {
+    if (instType === 'PERP') {
         return handleSubmitOrderOfPerp(credential, order);
     }
     throw new Error(`Unsupported account_id for SubmitOrder: ${order.account_id}`);