@yuants/vendor-okx 0.27.4 → 0.27.5

package/dist/account-actions-with-credential.js

@@ -1,7 +1,7 @@
 import { provideAccountActionsWithCredential } from '@yuants/data-account';
 import { Terminal } from '@yuants/protocol';
-import { getAccountIds } from './accountInfos/uid';
 import { getEarningAccountInfo, getFundingAccountInfo, getLoanAccountInfo, getStrategyAccountInfo, getTradingAccountInfo, } from './accountInfos';
+import { getAccountIds } from './accountInfos/uid';
 provideAccountActionsWithCredential(Terminal.fromNodeEnv(), 'OKX', {
     type: 'object',
     required: ['access_key', 'secret_key', 'passphrase'],
@@ -23,15 +23,15 @@ provideAccountActionsWithCredential(Terminal.fromNodeEnv(), 'OKX', {
             throw new Error('Failed to get account IDs');
         switch (account_id) {
             case accountIds.trading:
-                return getTradingAccountInfo(credential);
+                return getTradingAccountInfo(credential, account_id);
             case accountIds.funding:
-                return getFundingAccountInfo(credential);
+                return getFundingAccountInfo(credential, account_id);
             case accountIds.earning:
-                return getEarningAccountInfo(credential);
+                return getEarningAccountInfo(credential, account_id);
             case accountIds.loan:
-                return getLoanAccountInfo(credential);
+                return getLoanAccountInfo(credential, account_id);
             case accountIds.strategy:
-                return getStrategyAccountInfo(credential);
+                return getStrategyAccountInfo(credential, account_id);
         }
         throw new Error(`Unsupported account_id: ${account_id}`);
     },

package/dist/account-actions-with-credential.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-actions-with-credential.js","sourceRoot":"","sources":["../src/account-actions-with-credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AAExB,mCAAmC,CACjC,QAAQ,CAAC,WAAW,EAAE,EACtB,KAAK,EACL;IACE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC;IACpD,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;CACF,EACD;IACE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,QAAQ,UAAU,EAAE;YAClB,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,IAAI;gBAClB,OAAO,kBAAkB,CAAC,UAAU,CAAC,CAAC;YACxC,KAAK,UAAU,CAAC,QAAQ;gBACtB,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CACF,CAAC","sourcesContent":["import { provideAccountActionsWithCredential } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { ICredential } from './api/private-api';\nimport { getAccountIds } from './accountInfos/uid';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getStrategyAccountInfo,\n  getTradingAccountInfo,\n} from './accountInfos';\n\nprovideAccountActionsWithCredential<ICredential>(\n  Terminal.fromNodeEnv(),\n  'OKX',\n  {\n    type: 'object',\n    required: ['access_key', 'secret_key', 'passphrase'],\n    properties: {\n      access_key: { type: 'string' },\n      secret_key: { type: 'string' },\n      passphrase: { type: 'string' },\n    },\n  },\n  {\n    listAccounts: async (credential) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      return Object.values(accountIds).map((account_id) => ({ account_id }));\n    },\n    getAccountInfo: async (credential, account_id) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      switch (account_id) {\n        case accountIds.trading:\n          return getTradingAccountInfo(credential);\n        case accountIds.funding:\n          return getFundingAccountInfo(credential);\n        case accountIds.earning:\n          return getEarningAccountInfo(credential);\n        case accountIds.loan:\n          return getLoanAccountInfo(credential);\n        case accountIds.strategy:\n          return getStrategyAccountInfo(credential);\n      }\n      throw new Error(`Unsupported account_id: ${account_id}`);\n    },\n  },\n);\n"]}
+{"version":3,"file":"account-actions-with-credential.js","sourceRoot":"","sources":["../src/account-actions-with-credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,mCAAmC,CACjC,QAAQ,CAAC,WAAW,EAAE,EACtB,KAAK,EACL;IACE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC;IACpD,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;CACF,EACD;IACE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,QAAQ,UAAU,EAAE;YAClB,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,qBAAqB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,IAAI;gBAClB,OAAO,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACpD,KAAK,UAAU,CAAC,QAAQ;gBACtB,OAAO,sBAAsB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACzD;QACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CACF,CAAC","sourcesContent":["import { provideAccountActionsWithCredential } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getStrategyAccountInfo,\n  getTradingAccountInfo,\n} from './accountInfos';\nimport { getAccountIds } from './accountInfos/uid';\nimport { ICredential } from './api/private-api';\n\nprovideAccountActionsWithCredential<ICredential>(\n  Terminal.fromNodeEnv(),\n  'OKX',\n  {\n    type: 'object',\n    required: ['access_key', 'secret_key', 'passphrase'],\n    properties: {\n      access_key: { type: 'string' },\n      secret_key: { type: 'string' },\n      passphrase: { type: 'string' },\n    },\n  },\n  {\n    listAccounts: async (credential) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      return Object.values(accountIds).map((account_id) => ({ account_id }));\n    },\n    getAccountInfo: async (credential, account_id) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      switch (account_id) {\n        case accountIds.trading:\n          return getTradingAccountInfo(credential, account_id);\n        case accountIds.funding:\n          return getFundingAccountInfo(credential, account_id);\n        case accountIds.earning:\n          return getEarningAccountInfo(credential, account_id);\n        case accountIds.loan:\n          return getLoanAccountInfo(credential, account_id);\n        case accountIds.strategy:\n          return getStrategyAccountInfo(credential, account_id);\n      }\n      throw new Error(`Unsupported account_id: ${account_id}`);\n    },\n  },\n);\n"]}

package/dist/account.js

@@ -17,25 +17,25 @@ defer(async () => {
 defer(async () => {
     const tradingAccountId = await getTradingAccountId(credential);
     addAccountMarket(terminal, { account_id: tradingAccountId, market_id: 'OKX' });
-    provideAccountInfoService(terminal, tradingAccountId, () => getTradingAccountInfo(credential), {
+    provideAccountInfoService(terminal, tradingAccountId, () => getTradingAccountInfo(credential, tradingAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();
 defer(async () => {
     const fundingAccountId = await getFundingAccountId(credential);
-    provideAccountInfoService(terminal, fundingAccountId, () => getFundingAccountInfo(credential), {
+    provideAccountInfoService(terminal, fundingAccountId, () => getFundingAccountInfo(credential, fundingAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();
 defer(async () => {
     const earningAccountId = await getEarningAccountId(credential);
-    provideAccountInfoService(terminal, earningAccountId, () => getEarningAccountInfo(credential), {
+    provideAccountInfoService(terminal, earningAccountId, () => getEarningAccountInfo(credential, earningAccountId), {
         auto_refresh_interval: 5000,
     });
 }).subscribe();
 defer(async () => {
     const loanAccountId = await getLoanAccountId(credential);
-    provideAccountInfoService(Terminal.fromNodeEnv(), loanAccountId, () => getLoanAccountInfo(credential), {
+    provideAccountInfoService(Terminal.fromNodeEnv(), loanAccountId, () => getLoanAccountInfo(credential, loanAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();

package/dist/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;AAE1C,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACzD,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE;QAChG,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/D,gBAAgB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/E,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE;QAC7F,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE/D,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE;QAC7F,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/D,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE;QAC7F,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACzD,yBAAyB,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QACrG,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,oCAAoC;AACpC,OAAO,EAAE,sBAAsB,EAAE,CAAC","sourcesContent":["import { addAccountMarket, provideAccountInfoService } from '@yuants/data-account';\nimport { providePendingOrdersService } from '@yuants/data-order';\nimport { Terminal } from '@yuants/protocol';\nimport { defer } from 'rxjs';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getTradingAccountInfo,\n  marketIndexTickerUSDT$,\n} from './accountInfos';\nimport {\n  getEarningAccountId,\n  getFundingAccountId,\n  getLoanAccountId,\n  getTradingAccountId,\n} from './accountInfos/uid';\nimport { getDefaultCredential } from './api/private-api';\nimport { listOrders } from './orders/listOrders';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const account_id = await getTradingAccountId(credential);\n  providePendingOrdersService(terminal, account_id, async () => listOrders(credential, account_id), {\n    auto_refresh_interval: 5000,\n  });\n}).subscribe();\n\ndefer(async () => {\n  const tradingAccountId = await getTradingAccountId(credential);\n  addAccountMarket(terminal, { account_id: tradingAccountId, market_id: 'OKX' });\n\n  provideAccountInfoService(terminal, tradingAccountId, () => getTradingAccountInfo(credential), {\n    auto_refresh_interval: 1000,\n  });\n}).subscribe();\n\ndefer(async () => {\n  const fundingAccountId = await getFundingAccountId(credential);\n\n  provideAccountInfoService(terminal, fundingAccountId, () => getFundingAccountInfo(credential), {\n    auto_refresh_interval: 1000,\n  });\n}).subscribe();\n\ndefer(async () => {\n  const earningAccountId = await getEarningAccountId(credential);\n  provideAccountInfoService(terminal, earningAccountId, () => getEarningAccountInfo(credential), {\n    auto_refresh_interval: 5000,\n  });\n}).subscribe();\n\ndefer(async () => {\n  const loanAccountId = await getLoanAccountId(credential);\n  provideAccountInfoService(Terminal.fromNodeEnv(), loanAccountId, () => getLoanAccountInfo(credential), {\n    auto_refresh_interval: 1000,\n  });\n}).subscribe();\n\n// 导出 marketIndexTickerUSDT$ 供其他模块使用\nexport { marketIndexTickerUSDT$ };\n"]}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;AAE1C,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACzD,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE;QAChG,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/D,gBAAgB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/E,yBAAyB,CACvB,QAAQ,EACR,gBAAgB,EAChB,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACzD;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE/D,yBAAyB,CACvB,QAAQ,EACR,gBAAgB,EAChB,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACzD;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/D,yBAAyB,CACvB,QAAQ,EACR,gBAAgB,EAChB,GAAG,EAAE,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACzD;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACzD,yBAAyB,CACvB,QAAQ,CAAC,WAAW,EAAE,EACtB,aAAa,EACb,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,aAAa,CAAC,EACnD;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAEf,oCAAoC;AACpC,OAAO,EAAE,sBAAsB,EAAE,CAAC","sourcesContent":["import { addAccountMarket, provideAccountInfoService } from '@yuants/data-account';\nimport { providePendingOrdersService } from '@yuants/data-order';\nimport { Terminal } from '@yuants/protocol';\nimport { defer } from 'rxjs';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getTradingAccountInfo,\n  marketIndexTickerUSDT$,\n} from './accountInfos';\nimport {\n  getEarningAccountId,\n  getFundingAccountId,\n  getLoanAccountId,\n  getTradingAccountId,\n} from './accountInfos/uid';\nimport { getDefaultCredential } from './api/private-api';\nimport { listOrders } from './orders/listOrders';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const account_id = await getTradingAccountId(credential);\n  providePendingOrdersService(terminal, account_id, async () => listOrders(credential, account_id), {\n    auto_refresh_interval: 5000,\n  });\n}).subscribe();\n\ndefer(async () => {\n  const tradingAccountId = await getTradingAccountId(credential);\n  addAccountMarket(terminal, { account_id: tradingAccountId, market_id: 'OKX' });\n\n  provideAccountInfoService(\n    terminal,\n    tradingAccountId,\n    () => getTradingAccountInfo(credential, tradingAccountId),\n    {\n      auto_refresh_interval: 1000,\n    },\n  );\n}).subscribe();\n\ndefer(async () => {\n  const fundingAccountId = await getFundingAccountId(credential);\n\n  provideAccountInfoService(\n    terminal,\n    fundingAccountId,\n    () => getFundingAccountInfo(credential, fundingAccountId),\n    {\n      auto_refresh_interval: 1000,\n    },\n  );\n}).subscribe();\n\ndefer(async () => {\n  const earningAccountId = await getEarningAccountId(credential);\n  provideAccountInfoService(\n    terminal,\n    earningAccountId,\n    () => getEarningAccountInfo(credential, earningAccountId),\n    {\n      auto_refresh_interval: 5000,\n    },\n  );\n}).subscribe();\n\ndefer(async () => {\n  const loanAccountId = await getLoanAccountId(credential);\n  provideAccountInfoService(\n    Terminal.fromNodeEnv(),\n    loanAccountId,\n    () => getLoanAccountInfo(credential, loanAccountId),\n    {\n      auto_refresh_interval: 1000,\n    },\n  );\n}).subscribe();\n\n// 导出 marketIndexTickerUSDT$ 供其他模块使用\nexport { marketIndexTickerUSDT$ };\n"]}

package/dist/accountInfos/earning.js

@@ -1,15 +1,17 @@
+import { makeSpotPosition } from '@yuants/data-account';
 import { getFinanceSavingsBalance } from '../api/private-api';
+import { getSpotPrice } from './trading';
 export const getEarningAccountInfo = async (credential) => {
     const offers = await getFinanceSavingsBalance(credential, {});
-    const equity = offers.data.filter((x) => x.ccy === 'USDT').reduce((acc, x) => acc + +x.amt, 0);
-    const free = equity;
-    return {
-        money: {
-            currency: 'USDT',
-            equity,
-            free,
-        },
-        positions: [],
-    };
+    return offers.data.map((offer) => {
+        return makeSpotPosition({
+            position_id: `earning/${offer.ccy}`,
+            datasource_id: 'OKX',
+            product_id: `earning/${offer.ccy}`,
+            volume: +offer.amt,
+            free_volume: +offer.amt,
+            closable_price: getSpotPrice(offer.ccy),
+        });
+    });
 };
 //# sourceMappingURL=earning.js.map

package/dist/accountInfos/earning.js.map

@@ -1 +1 @@
-{"version":3,"file":"earning.js","sourceRoot":"","sources":["../../src/accountInfos/earning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAG3E,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,UAAuB,EAA6B,EAAE;IAChG,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC/F,MAAM,IAAI,GAAG,MAAM,CAAC;IAEpB,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,MAAM;YAChB,MAAM;YACN,IAAI;SACL;QACD,SAAS,EAAE,EAAE;KACd,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { ICredential, getFinanceSavingsBalance } from '../api/private-api';\nimport { IAccountInfoCore } from './types';\n\nexport const getEarningAccountInfo = async (credential: ICredential): Promise<IAccountInfoCore> => {\n  const offers = await getFinanceSavingsBalance(credential, {});\n  const equity = offers.data.filter((x) => x.ccy === 'USDT').reduce((acc, x) => acc + +x.amt, 0);\n  const free = equity;\n\n  return {\n    money: {\n      currency: 'USDT',\n      equity,\n      free,\n    },\n    positions: [],\n  };\n};\n"]}
+{"version":3,"file":"earning.js","sourceRoot":"","sources":["../../src/accountInfos/earning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExF,OAAO,EAAe,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAA0B,MAAM,WAAW,CAAC;AAEjE,MAAM,CAAC,MAAM,qBAAqB,GAAgD,KAAK,EAAE,UAAU,EAAE,EAAE;IACrG,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE9D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC/B,OAAO,gBAAgB,CAAC;YACtB,WAAW,EAAE,WAAW,KAAK,CAAC,GAAG,EAAE;YACnC,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,WAAW,KAAK,CAAC,GAAG,EAAE;YAClC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG;YAClB,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG;YACvB,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC;SACxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, makeSpotPosition } from '@yuants/data-account';\nimport { firstValueFrom } from 'rxjs';\nimport { ICredential, getFinanceSavingsBalance } from '../api/private-api';\nimport { getSpotPrice, marketIndexTickerUSDT$ } from './trading';\n\nexport const getEarningAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  const offers = await getFinanceSavingsBalance(credential, {});\n\n  return offers.data.map((offer) => {\n    return makeSpotPosition({\n      position_id: `earning/${offer.ccy}`,\n      datasource_id: 'OKX',\n      product_id: `earning/${offer.ccy}`,\n      volume: +offer.amt,\n      free_volume: +offer.amt,\n      closable_price: getSpotPrice(offer.ccy),\n    });\n  });\n};\n"]}

package/dist/accountInfos/funding.js

@@ -1,46 +1,16 @@
+import { makeSpotPosition } from '@yuants/data-account';
 import { encodePath } from '@yuants/utils';
-import { firstValueFrom } from 'rxjs';
 import { getAssetBalances } from '../api/private-api';
-import { marketIndexTickerUSDT$ } from './trading';
+import { getSpotPrice } from './trading';
 export const getFundingAccountInfo = async (credential) => {
-    const [assetBalances, marketIndexTickerUSDT] = await Promise.all([
-        getAssetBalances(credential, {}),
-        firstValueFrom(marketIndexTickerUSDT$),
-    ]);
-    const positions = [];
-    let equity = 0;
-    let free = 0;
-    assetBalances.data.forEach((x) => {
-        if (x.ccy === 'USDT') {
-            const balance = +x.bal;
-            equity += balance;
-            free += balance;
-            return;
-        }
-        const price = marketIndexTickerUSDT.get(`${x.ccy}-USDT`) || 0;
-        const valuation = price * +x.bal || 0;
-        const productId = encodePath('SPOT', `${x.ccy}-USDT`);
-        positions.push({
-            datasource_id: 'OKX',
-            position_id: productId,
-            product_id: productId,
-            direction: 'LONG',
-            volume: +x.bal,
-            free_volume: +x.bal,
-            position_price: price,
-            floating_profit: 0,
-            closable_price: price,
-            valuation,
-        });
-        equity += valuation;
-    });
-    return {
-        money: {
-            currency: 'USDT',
-            equity,
-            free,
-        },
-        positions,
-    };
+    const assetBalances = await getAssetBalances(credential, {});
+    return assetBalances.data.map((x) => makeSpotPosition({
+        datasource_id: 'OKX',
+        position_id: encodePath('SPOT', `${x.ccy}-USDT`),
+        product_id: encodePath('SPOT', `${x.ccy}-USDT`),
+        volume: +x.bal,
+        free_volume: +x.bal,
+        closable_price: getSpotPrice(x.ccy),
+    }));
 };
 //# sourceMappingURL=funding.js.map

package/dist/accountInfos/funding.js.map

@@ -1 +1 @@
-{"version":3,"file":"funding.js","sourceRoot":"","sources":["../../src/accountInfos/funding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAGnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,UAAuB,EAA6B,EAAE;IAChG,MAAM,CAAC,aAAa,EAAE,qBAAqB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/D,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;QAChC,cAAc,CAAC,sBAAsB,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAgB,EAAE,CAAC;IAClC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAC,CAAC,GAAG,KAAK,MAAM,EAAE;YACpB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YACvB,MAAM,IAAI,OAAO,CAAC;YAClB,IAAI,IAAI,OAAO,CAAC;YAChB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;QAEtD,SAAS,CAAC,IAAI,CAAC;YACb,aAAa,EAAE,KAAK;YACpB,WAAW,EAAE,SAAS;YACtB,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG;YACd,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG;YACnB,cAAc,EAAE,KAAK;YACrB,eAAe,EAAE,CAAC;YAClB,cAAc,EAAE,KAAK;YACrB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,IAAI,SAAS,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,MAAM;YAChB,MAAM;YACN,IAAI;SACL;QACD,SAAS;KACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { firstValueFrom } from 'rxjs';\nimport { ICredential, getAssetBalances } from '../api/private-api';\nimport { marketIndexTickerUSDT$ } from './trading';\nimport { IAccountInfoCore } from './types';\n\nexport const getFundingAccountInfo = async (credential: ICredential): Promise<IAccountInfoCore> => {\n  const [assetBalances, marketIndexTickerUSDT] = await Promise.all([\n    getAssetBalances(credential, {}),\n    firstValueFrom(marketIndexTickerUSDT$),\n  ]);\n\n  const positions: IPosition[] = [];\n  let equity = 0;\n  let free = 0;\n\n  assetBalances.data.forEach((x) => {\n    if (x.ccy === 'USDT') {\n      const balance = +x.bal;\n      equity += balance;\n      free += balance;\n      return;\n    }\n\n    const price = marketIndexTickerUSDT.get(`${x.ccy}-USDT`) || 0;\n    const valuation = price * +x.bal || 0;\n    const productId = encodePath('SPOT', `${x.ccy}-USDT`);\n\n    positions.push({\n      datasource_id: 'OKX',\n      position_id: productId,\n      product_id: productId,\n      direction: 'LONG',\n      volume: +x.bal,\n      free_volume: +x.bal,\n      position_price: price,\n      floating_profit: 0,\n      closable_price: price,\n      valuation,\n    });\n\n    equity += valuation;\n  });\n\n  return {\n    money: {\n      currency: 'USDT',\n      equity,\n      free,\n    },\n    positions,\n  };\n};\n"]}
+{"version":3,"file":"funding.js","sourceRoot":"","sources":["../../src/accountInfos/funding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,CAAC,MAAM,qBAAqB,GAAgD,KAAK,EAAE,UAAU,EAAE,EAAE;IACrG,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE7D,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,gBAAgB,CAAC;QACf,aAAa,EAAE,KAAK;QACpB,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;QAChD,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;QAC/C,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG;QACd,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG;QACnB,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC;KACpC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, makeSpotPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { ICredential, getAssetBalances } from '../api/private-api';\nimport { getSpotPrice } from './trading';\n\nexport const getFundingAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  const assetBalances = await getAssetBalances(credential, {});\n\n  return assetBalances.data.map((x) =>\n    makeSpotPosition({\n      datasource_id: 'OKX',\n      position_id: encodePath('SPOT', `${x.ccy}-USDT`),\n      product_id: encodePath('SPOT', `${x.ccy}-USDT`),\n      volume: +x.bal,\n      free_volume: +x.bal,\n      closable_price: getSpotPrice(x.ccy),\n    }),\n  );\n};\n"]}

package/dist/accountInfos/loan.js

@@ -1,10 +1,14 @@
+import { makeSpotPosition } from '@yuants/data-account';
 import { encodePath } from '@yuants/utils';
 import { getFlexibleLoanInfo } from '../api/private-api';
+import { getSpotPrice } from './trading';
 export const getLoanAccountInfo = async (credential) => {
     const res = await getFlexibleLoanInfo(credential);
     const data = res.data[0];
+    if (!data)
+        return [];
     const positions = [];
-    const loanData = (data === null || data === void 0 ? void 0 : data.loanData) || [];
+    const loanData = data.loanData || [];
     for (const loan of loanData) {
         positions.push({
             datasource_id: 'OKX',
@@ -14,35 +18,22 @@ export const getLoanAccountInfo = async (credential) => {
             position_id: encodePath('loan', loan.ccy),
             direction: 'SHORT',
             position_price: 0,
-            closable_price: 0,
-            floating_profit: 0,
-            valuation: 0,
+            closable_price: getSpotPrice(loan.ccy),
+            floating_profit: -getSpotPrice(loan.ccy) * +loan.amt,
+            valuation: getSpotPrice(loan.ccy) * +loan.amt,
         });
     }
-    const collateralData = (data === null || data === void 0 ? void 0 : data.collateralData) || [];
+    const collateralData = data.collateralData || [];
     for (const collateral of collateralData) {
-        positions.push({
+        positions.push(makeSpotPosition({
+            position_id: encodePath('collateral', collateral.ccy),
             datasource_id: 'OKX',
             product_id: `SPOT/${collateral.ccy}-USDT`,
             volume: +collateral.amt,
             free_volume: +collateral.amt,
-            position_id: encodePath('collateral', collateral.ccy),
-            direction: 'LONG',
-            position_price: 0,
-            closable_price: 0,
-            floating_profit: 0,
-            valuation: 0,
-        });
+            closable_price: getSpotPrice(collateral.ccy),
+        }));
     }
-    const equity = +data.collateralNotionalUsd - +data.loanNotionalUsd;
-    const free = equity - +data.collateralNotionalUsd;
-    return {
-        money: {
-            currency: 'USDT',
-            equity,
-            free,
-        },
-        positions,
-    };
+    return positions;
 };
 //# sourceMappingURL=loan.js.map

package/dist/accountInfos/loan.js.map

@@ -1 +1 @@
-{"version":3,"file":"loan.js","sourceRoot":"","sources":["../../src/accountInfos/loan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAe,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,UAAuB,EAA6B,EAAE;IAC7F,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAgB,EAAE,CAAC;IAElC,MAAM,QAAQ,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,SAAS,CAAC,IAAI,CAAC;YACb,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,QAAQ,IAAI,CAAC,GAAG,OAAO;YACnC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG;YACjB,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG;YACtB,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC;YACzC,SAAS,EAAE,OAAO;YAClB,cAAc,EAAE,CAAC;YACjB,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;YAClB,SAAS,EAAE,CAAC;SACb,CAAC,CAAC;KACJ;IACD,MAAM,cAAc,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,KAAI,EAAE,CAAC;IAClD,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;QACvC,SAAS,CAAC,IAAI,CAAC;YACb,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,QAAQ,UAAU,CAAC,GAAG,OAAO;YACzC,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG;YACvB,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG;YAC5B,WAAW,EAAE,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC;YACrD,SAAS,EAAE,MAAM;YACjB,cAAc,EAAE,CAAC;YACjB,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;YAClB,SAAS,EAAE,CAAC;SACb,CAAC,CAAC;KACJ;IACD,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC;IACnE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC;IAElD,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,MAAM;YAChB,MAAM;YACN,IAAI;SACL;QACD,SAAS;KACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { ICredential, getFlexibleLoanInfo } from '../api/private-api';\nimport { IAccountInfoCore } from './types';\n\nexport const getLoanAccountInfo = async (credential: ICredential): Promise<IAccountInfoCore> => {\n  const res = await getFlexibleLoanInfo(credential);\n  const data = res.data[0];\n\n  const positions: IPosition[] = [];\n\n  const loanData = data?.loanData || [];\n  for (const loan of loanData) {\n    positions.push({\n      datasource_id: 'OKX',\n      product_id: `SPOT/${loan.ccy}-USDT`,\n      volume: +loan.amt,\n      free_volume: +loan.amt,\n      position_id: encodePath('loan', loan.ccy),\n      direction: 'SHORT',\n      position_price: 0,\n      closable_price: 0,\n      floating_profit: 0,\n      valuation: 0,\n    });\n  }\n  const collateralData = data?.collateralData || [];\n  for (const collateral of collateralData) {\n    positions.push({\n      datasource_id: 'OKX',\n      product_id: `SPOT/${collateral.ccy}-USDT`,\n      volume: +collateral.amt,\n      free_volume: +collateral.amt,\n      position_id: encodePath('collateral', collateral.ccy),\n      direction: 'LONG',\n      position_price: 0,\n      closable_price: 0,\n      floating_profit: 0,\n      valuation: 0,\n    });\n  }\n  const equity = +data.collateralNotionalUsd - +data.loanNotionalUsd;\n  const free = equity - +data.collateralNotionalUsd;\n\n  return {\n    money: {\n      currency: 'USDT',\n      equity,\n      free,\n    },\n    positions,\n  };\n};\n"]}
+{"version":3,"file":"loan.js","sourceRoot":"","sources":["../../src/accountInfos/loan.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAe,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,CAAC,MAAM,kBAAkB,GAAgD,KAAK,EAAE,UAAU,EAAE,EAAE;IAClG,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAErB,MAAM,SAAS,GAAgB,EAAE,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,SAAS,CAAC,IAAI,CAAC;YACb,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,QAAQ,IAAI,CAAC,GAAG,OAAO;YACnC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG;YACjB,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG;YACtB,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC;YACzC,SAAS,EAAE,OAAO;YAClB,cAAc,EAAE,CAAC;YACjB,cAAc,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;YACtC,eAAe,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;YACpD,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;SAC9C,CAAC,CAAC;KACJ;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;IACjD,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;QACvC,SAAS,CAAC,IAAI,CACZ,gBAAgB,CAAC;YACf,WAAW,EAAE,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC;YACrD,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,QAAQ,UAAU,CAAC,GAAG,OAAO;YACzC,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG;YACvB,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG;YAC5B,cAAc,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;SAC7C,CAAC,CACH,CAAC;KACH;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition, makeSpotPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { ICredential, getFlexibleLoanInfo } from '../api/private-api';\nimport { getSpotPrice } from './trading';\n\nexport const getLoanAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  const res = await getFlexibleLoanInfo(credential);\n  const data = res.data[0];\n  if (!data) return [];\n\n  const positions: IPosition[] = [];\n\n  const loanData = data.loanData || [];\n  for (const loan of loanData) {\n    positions.push({\n      datasource_id: 'OKX',\n      product_id: `SPOT/${loan.ccy}-USDT`,\n      volume: +loan.amt,\n      free_volume: +loan.amt,\n      position_id: encodePath('loan', loan.ccy),\n      direction: 'SHORT',\n      position_price: 0,\n      closable_price: getSpotPrice(loan.ccy),\n      floating_profit: -getSpotPrice(loan.ccy) * +loan.amt,\n      valuation: getSpotPrice(loan.ccy) * +loan.amt,\n    });\n  }\n  const collateralData = data.collateralData || [];\n  for (const collateral of collateralData) {\n    positions.push(\n      makeSpotPosition({\n        position_id: encodePath('collateral', collateral.ccy),\n        datasource_id: 'OKX',\n        product_id: `SPOT/${collateral.ccy}-USDT`,\n        volume: +collateral.amt,\n        free_volume: +collateral.amt,\n        closable_price: getSpotPrice(collateral.ccy),\n      }),\n    );\n  }\n\n  return positions;\n};\n"]}

package/dist/accountInfos/strategy.js

@@ -44,13 +44,6 @@ export const getStrategyAccountInfo = async (credential) => {
             totalEquity += positionValuation / leverage;
         }
     });
-    return {
-        money: {
-            currency: 'USDT',
-            equity: totalEquity,
-            free: 0, // TODO: 累计策略的可提取资金作为 free
-        },
-        positions,
-    };
+    return positions;
 };
 //# sourceMappingURL=strategy.js.map

package/dist/accountInfos/strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../src/accountInfos/strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAe,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,UAAuB,EAA6B,EAAE;IACjG,iCAAiC;IACjC,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzC,wBAAwB,CAAC,UAAU,EAAE;YACnC,WAAW,EAAE,eAAe;SAC7B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,SAAS,GAAgB,EAAE,CAAC;IAElC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/B,gBAAgB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CACpF,CACF,CAAC;IAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;;QAChD,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAC1B,MAAM,QAAQ,GAAG,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,WAAW,CAAA,CAAC;QAC3D,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;YACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,EAAE;gBACvB,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,CAAC,0CAAE,SAAS,mCAAI,EAAE,CAAC;gBACnE,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBACrE,SAAS,CAAC,IAAI,CAAC;oBACb,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;oBACzD,aAAa,EAAE,KAAK;oBACpB,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;oBAC1D,SAAS;oBACT,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAC/B,WAAW,EAAE,CAAC,QAAQ,CAAC,GAAG;oBAC1B,cAAc,EAAE,CAAC,QAAQ,CAAC,KAAK;oBAC/B,eAAe,EAAE,CAAC,QAAQ,CAAC,GAAG;oBAC9B,cAAc,EAAE,CAAC,QAAQ,CAAC,IAAI;oBAC9B,SAAS,EAAE,CAAC,QAAQ,CAAC,WAAW;iBACjC,CAAC,CAAC;gBACH,iBAAiB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,KAAK,CAAC,EAAE;YAClB,mCAAmC;YACnC,WAAW,IAAI,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,UAAU,CAAA,GAAG,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,QAAQ,CAAA,CAAC;SAClG;aAAM;YACL,oCAAoC;YACpC,yBAAyB;YACzB,WAAW,IAAI,iBAAiB,GAAG,QAAQ,CAAC;SAC7C;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,WAAW;YACnB,IAAI,EAAE,CAAC,EAAE,0BAA0B;SACpC;QACD,SAAS;KACV,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { ICredential, getGridOrdersAlgoPending, getGridPositions } from '../api/private-api';\nimport { IAccountInfoCore } from './types';\n\nexport const getStrategyAccountInfo = async (credential: ICredential): Promise<IAccountInfoCore> => {\n  // TODO: 需要分页获取所有的网格订单 (每页 100 条)\n  const [gridAlgoOrders] = await Promise.all([\n    getGridOrdersAlgoPending(credential, {\n      algoOrdType: 'contract_grid',\n    }),\n  ]);\n\n  let totalEquity = 0;\n  const positions: IPosition[] = [];\n\n  const gridPositionsRes = await Promise.all(\n    gridAlgoOrders.data.map((item) =>\n      getGridPositions(credential, { algoOrdType: 'contract_grid', algoId: item.algoId }),\n    ),\n  );\n\n  gridPositionsRes.forEach((gridPositions, index) => {\n    let positionValuation = 0;\n    const leverage = +gridAlgoOrders.data?.[index].actualLever;\n    gridPositions?.data?.forEach((position) => {\n      if (+position.pos !== 0) {\n        const directionRaw = gridAlgoOrders.data?.[index]?.direction ?? '';\n        const direction = directionRaw ? directionRaw.toUpperCase() : 'LONG';\n        positions.push({\n          position_id: encodePath(position.algoId, position.instId),\n          datasource_id: 'OKX',\n          product_id: encodePath(position.instType, position.instId),\n          direction,\n          volume: Math.abs(+position.pos),\n          free_volume: +position.pos,\n          position_price: +position.avgPx,\n          floating_profit: +position.upl,\n          closable_price: +position.last,\n          valuation: +position.notionalUsd,\n        });\n        positionValuation += +position.notionalUsd;\n      }\n    });\n    if (leverage === 0) {\n      // 实际杠杆为 0，说明没有持仓，直接把投资金额和累计盈亏算到净值里\n      totalEquity += +gridAlgoOrders.data?.[index].investment + +gridAlgoOrders.data?.[index].totalPnl;\n    } else {\n      // 历史提取金额不会从 investment, totalPnl 扣减\n      // 计算净值需要通过仓位的名义价值和实际杠杆计算\n      totalEquity += positionValuation / leverage;\n    }\n  });\n\n  return {\n    money: {\n      currency: 'USDT',\n      equity: totalEquity,\n      free: 0, // TODO: 累计策略的可提取资金作为 free\n    },\n    positions,\n  };\n};\n"]}
+{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../src/accountInfos/strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAe,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE7F,MAAM,CAAC,MAAM,sBAAsB,GAAgD,KAAK,EAAE,UAAU,EAAE,EAAE;IACtG,iCAAiC;IACjC,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzC,wBAAwB,CAAC,UAAU,EAAE;YACnC,WAAW,EAAE,eAAe;SAC7B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,SAAS,GAAgB,EAAE,CAAC;IAElC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/B,gBAAgB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CACpF,CACF,CAAC;IAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;;QAChD,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAC1B,MAAM,QAAQ,GAAG,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,WAAW,CAAA,CAAC;QAC3D,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;YACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,EAAE;gBACvB,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,CAAC,0CAAE,SAAS,mCAAI,EAAE,CAAC;gBACnE,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBACrE,SAAS,CAAC,IAAI,CAAC;oBACb,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;oBACzD,aAAa,EAAE,KAAK;oBACpB,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;oBAC1D,SAAS;oBACT,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAC/B,WAAW,EAAE,CAAC,QAAQ,CAAC,GAAG;oBAC1B,cAAc,EAAE,CAAC,QAAQ,CAAC,KAAK;oBAC/B,eAAe,EAAE,CAAC,QAAQ,CAAC,GAAG;oBAC9B,cAAc,EAAE,CAAC,QAAQ,CAAC,IAAI;oBAC9B,SAAS,EAAE,CAAC,QAAQ,CAAC,WAAW;iBACjC,CAAC,CAAC;gBACH,iBAAiB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,KAAK,CAAC,EAAE;YAClB,mCAAmC;YACnC,WAAW,IAAI,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,UAAU,CAAA,GAAG,CAAC,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAG,KAAK,EAAE,QAAQ,CAAA,CAAC;SAClG;aAAM;YACL,oCAAoC;YACpC,yBAAyB;YACzB,WAAW,IAAI,iBAAiB,GAAG,QAAQ,CAAC;SAC7C;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { ICredential, getGridOrdersAlgoPending, getGridPositions } from '../api/private-api';\n\nexport const getStrategyAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  // TODO: 需要分页获取所有的网格订单 (每页 100 条)\n  const [gridAlgoOrders] = await Promise.all([\n    getGridOrdersAlgoPending(credential, {\n      algoOrdType: 'contract_grid',\n    }),\n  ]);\n\n  let totalEquity = 0;\n  const positions: IPosition[] = [];\n\n  const gridPositionsRes = await Promise.all(\n    gridAlgoOrders.data.map((item) =>\n      getGridPositions(credential, { algoOrdType: 'contract_grid', algoId: item.algoId }),\n    ),\n  );\n\n  gridPositionsRes.forEach((gridPositions, index) => {\n    let positionValuation = 0;\n    const leverage = +gridAlgoOrders.data?.[index].actualLever;\n    gridPositions?.data?.forEach((position) => {\n      if (+position.pos !== 0) {\n        const directionRaw = gridAlgoOrders.data?.[index]?.direction ?? '';\n        const direction = directionRaw ? directionRaw.toUpperCase() : 'LONG';\n        positions.push({\n          position_id: encodePath(position.algoId, position.instId),\n          datasource_id: 'OKX',\n          product_id: encodePath(position.instType, position.instId),\n          direction,\n          volume: Math.abs(+position.pos),\n          free_volume: +position.pos,\n          position_price: +position.avgPx,\n          floating_profit: +position.upl,\n          closable_price: +position.last,\n          valuation: +position.notionalUsd,\n        });\n        positionValuation += +position.notionalUsd;\n      }\n    });\n    if (leverage === 0) {\n      // 实际杠杆为 0，说明没有持仓，直接把投资金额和累计盈亏算到净值里\n      totalEquity += +gridAlgoOrders.data?.[index].investment + +gridAlgoOrders.data?.[index].totalPnl;\n    } else {\n      // 历史提取金额不会从 investment, totalPnl 扣减\n      // 计算净值需要通过仓位的名义价值和实际杠杆计算\n      totalEquity += positionValuation / leverage;\n    }\n  });\n\n  return positions;\n};\n"]}

package/dist/accountInfos/trading.js

@@ -1,24 +1,33 @@
+import { makeSpotPosition } from '@yuants/data-account';
 import { encodePath } from '@yuants/utils';
 import { defer, firstValueFrom, map, repeat, retry, shareReplay } from 'rxjs';
 import { getAccountBalance, getAccountPositions } from '../api/private-api';
 import { getMarketIndexTicker } from '../api/public-api';
 import { productService } from '../public-data/product';
+const priceCache = new Map();
 export const marketIndexTickerUSDT$ = defer(() => getMarketIndexTicker({ quoteCcy: 'USDT' })).pipe(map((x) => {
     const mapInstIdToPrice = new Map();
-    x.data.forEach((inst) => mapInstIdToPrice.set(inst.instId, Number(inst.idxPx)));
+    x.data.forEach((inst) => {
+        mapInstIdToPrice.set(inst.instId, Number(inst.idxPx));
+        priceCache.set(inst.instId, Number(inst.idxPx));
+    });
     return mapInstIdToPrice;
 }), repeat({ delay: 1000 }), retry({ delay: 5000 }), shareReplay(1));
+marketIndexTickerUSDT$.subscribe();
+export const getSpotPrice = (ccy) => {
+    if (ccy === 'USDT')
+        return 1;
+    return priceCache.get(`${ccy}-USDT`) || 0;
+};
 export const getTradingAccountInfo = async (credential) => {
     var _a;
-    const [positionsApi, balanceApi, mapProductIdToProduct, marketIndexTickerUSDT] = await Promise.all([
+    const [positionsApi, balanceApi, mapProductIdToProduct] = await Promise.all([
         getAccountPositions(credential, {}),
         getAccountBalance(credential, {}),
         firstValueFrom(productService.mapProductIdToProduct$),
-        firstValueFrom(marketIndexTickerUSDT$),
     ]);
-    let totalEquity = 0;
-    let totalFree = 0;
     const positions = [];
+    // 现货头寸
     (_a = balanceApi.data[0]) === null || _a === void 0 ? void 0 : _a.details.forEach((detail) => {
         var _a, _b, _c, _d, _e, _f;
         if (detail.ccy === 'USDT') {
@@ -26,30 +35,28 @@ export const getTradingAccountInfo = async (credential) => {
             const free = Math.min(balance, // free should no more than balance if there is much profits
             +((_b = detail.availEq) !== null && _b !== void 0 ? _b : 0));
             const equity = +((_c = detail.eq) !== null && _c !== void 0 ? _c : 0) - +((_d = detail.stgyEq) !== null && _d !== void 0 ? _d : 0);
-            totalEquity += equity;
-            totalFree += free;
+            positions.push(makeSpotPosition({
+                position_id: encodePath('SPOT', 'USDT'),
+                datasource_id: 'OKX',
+                product_id: encodePath('SPOT', 'USDT'),
+                volume: equity,
+                free_volume: free,
+                closable_price: 1,
+            }));
         }
         else {
             const volume = +((_e = detail.cashBal) !== null && _e !== void 0 ? _e : 0);
             const free_volume = Math.min(volume, // free should no more than balance if there is much profits
             +((_f = detail.availEq) !== null && _f !== void 0 ? _f : 0));
-            const closable_price = marketIndexTickerUSDT.get(detail.ccy + '-USDT') || 0;
-            const delta_equity = volume * closable_price || 0;
-            const delta_profit = +detail.totalPnl || 0;
             const product_id = encodePath('SPOT', `${detail.ccy}-USDT`);
-            positions.push({
+            positions.push(makeSpotPosition({
                 position_id: product_id,
                 datasource_id: 'OKX',
                 product_id: product_id,
-                direction: 'LONG',
                 volume: volume,
                 free_volume: free_volume,
-                position_price: +detail.accAvgPx,
-                floating_profit: delta_profit,
-                closable_price: closable_price,
-                valuation: delta_equity,
-            });
-            totalEquity += delta_equity;
+                closable_price: getSpotPrice(detail.ccy),
+            }));
         }
     });
     positionsApi.data.forEach((x) => {
@@ -72,13 +79,6 @@ export const getTradingAccountInfo = async (credential) => {
             valuation,
         });
     });
-    return {
-        money: {
-            currency: 'USDT',
-            equity: totalEquity,
-            free: totalFree,
-        },
-        positions: positions,
-    };
+    return positions;
 };
 //# sourceMappingURL=trading.js.map

package/dist/accountInfos/trading.js.map

@@ -1 +1 @@
-{"version":3,"file":"trading.js","sourceRoot":"","sources":["../../src/accountInfos/trading.ts"],"names":[],"mappings":"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","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { defer, firstValueFrom, map, repeat, retry, shareReplay } from 'rxjs';\nimport { ICredential, getAccountBalance, getAccountPositions } from '../api/private-api';\nimport { getMarketIndexTicker } from '../api/public-api';\nimport { productService } from '../public-data/product';\nimport { IAccountInfoCore } from './types';\n\nexport const marketIndexTickerUSDT$ = defer(() => getMarketIndexTicker({ quoteCcy: 'USDT' })).pipe(\n  map((x) => {\n    const mapInstIdToPrice = new Map<string, number>();\n    x.data.forEach((inst: any) => mapInstIdToPrice.set(inst.instId, Number(inst.idxPx)));\n    return mapInstIdToPrice;\n  }),\n  repeat({ delay: 1000 }),\n  retry({ delay: 5000 }),\n  shareReplay(1),\n);\n\nexport const getTradingAccountInfo = async (credential: ICredential): Promise<IAccountInfoCore> => {\n  const [positionsApi, balanceApi, mapProductIdToProduct, marketIndexTickerUSDT] = await Promise.all([\n    getAccountPositions(credential, {}),\n    getAccountBalance(credential, {}),\n    firstValueFrom(productService.mapProductIdToProduct$),\n    firstValueFrom(marketIndexTickerUSDT$),\n  ]);\n\n  let totalEquity = 0;\n  let totalFree = 0;\n  const positions: IPosition[] = [];\n\n  balanceApi.data[0]?.details.forEach((detail) => {\n    if (detail.ccy === 'USDT') {\n      const balance = +(detail.cashBal ?? 0);\n      const free = Math.min(\n        balance, // free should no more than balance if there is much profits\n        +(detail.availEq ?? 0),\n      );\n      const equity = +(detail.eq ?? 0) - +(detail.stgyEq ?? 0);\n      totalEquity += equity;\n      totalFree += free;\n    } else {\n      const volume = +(detail.cashBal ?? 0);\n      const free_volume = Math.min(\n        volume, // free should no more than balance if there is much profits\n        +(detail.availEq ?? 0),\n      );\n      const closable_price = marketIndexTickerUSDT.get(detail.ccy + '-USDT') || 0;\n      const delta_equity = volume * closable_price || 0;\n      const delta_profit = +detail.totalPnl || 0;\n\n      const product_id = encodePath('SPOT', `${detail.ccy}-USDT`);\n      positions.push({\n        position_id: product_id,\n        datasource_id: 'OKX',\n        product_id: product_id,\n        direction: 'LONG',\n        volume: volume,\n        free_volume: free_volume,\n        position_price: +detail.accAvgPx,\n        floating_profit: delta_profit,\n        closable_price: closable_price,\n        valuation: delta_equity,\n      });\n\n      totalEquity += delta_equity;\n    }\n  });\n  positionsApi.data.forEach((x) => {\n    const direction =\n      x.posSide === 'long' ? 'LONG' : x.posSide === 'short' ? 'SHORT' : +x.pos > 0 ? 'LONG' : 'SHORT';\n    const volume = Math.abs(+x.pos);\n    const product_id = encodePath(x.instType, x.instId);\n    const closable_price = +x.last;\n    const valuation =\n      (mapProductIdToProduct.get(product_id)?.value_scale ?? 1) * volume * closable_price || 0;\n\n    positions.push({\n      position_id: x.posId,\n      datasource_id: 'OKX',\n      product_id,\n      direction,\n      volume: volume,\n      free_volume: +x.availPos,\n      closable_price,\n      position_price: +x.avgPx,\n      floating_profit: +x.upl,\n      valuation,\n    });\n  });\n  return {\n    money: {\n      currency: 'USDT',\n      equity: totalEquity,\n      free: totalFree,\n    },\n    positions: positions,\n  };\n};\n"]}
+{"version":3,"file":"trading.js","sourceRoot":"","sources":["../../src/accountInfos/trading.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition, makeSpotPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { defer, firstValueFrom, map, repeat, retry, shareReplay } from 'rxjs';\nimport { ICredential, getAccountBalance, getAccountPositions } from '../api/private-api';\nimport { getMarketIndexTicker } from '../api/public-api';\nimport { productService } from '../public-data/product';\n\nconst priceCache = new Map<string, number>();\n\nexport const marketIndexTickerUSDT$ = defer(() => getMarketIndexTicker({ quoteCcy: 'USDT' })).pipe(\n  map((x) => {\n    const mapInstIdToPrice = new Map<string, number>();\n    x.data.forEach((inst: any) => {\n      mapInstIdToPrice.set(inst.instId, Number(inst.idxPx));\n      priceCache.set(inst.instId, Number(inst.idxPx));\n    });\n    return mapInstIdToPrice;\n  }),\n  repeat({ delay: 1000 }),\n  retry({ delay: 5000 }),\n  shareReplay(1),\n);\n\nmarketIndexTickerUSDT$.subscribe();\n\nexport const getSpotPrice = (ccy: string) => {\n  if (ccy === 'USDT') return 1;\n  return priceCache.get(`${ccy}-USDT`) || 0;\n};\n\nexport const getTradingAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (credential) => {\n  const [positionsApi, balanceApi, mapProductIdToProduct] = await Promise.all([\n    getAccountPositions(credential, {}),\n    getAccountBalance(credential, {}),\n    firstValueFrom(productService.mapProductIdToProduct$),\n  ]);\n\n  const positions: IPosition[] = [];\n\n  // 现货头寸\n  balanceApi.data[0]?.details.forEach((detail) => {\n    if (detail.ccy === 'USDT') {\n      const balance = +(detail.cashBal ?? 0);\n      const free = Math.min(\n        balance, // free should no more than balance if there is much profits\n        +(detail.availEq ?? 0),\n      );\n      const equity = +(detail.eq ?? 0) - +(detail.stgyEq ?? 0);\n      positions.push(\n        makeSpotPosition({\n          position_id: encodePath('SPOT', 'USDT'),\n          datasource_id: 'OKX',\n          product_id: encodePath('SPOT', 'USDT'),\n          volume: equity,\n          free_volume: free,\n          closable_price: 1,\n        }),\n      );\n    } else {\n      const volume = +(detail.cashBal ?? 0);\n      const free_volume = Math.min(\n        volume, // free should no more than balance if there is much profits\n        +(detail.availEq ?? 0),\n      );\n\n      const product_id = encodePath('SPOT', `${detail.ccy}-USDT`);\n      positions.push(\n        makeSpotPosition({\n          position_id: product_id,\n          datasource_id: 'OKX',\n          product_id: product_id,\n          volume: volume,\n          free_volume: free_volume,\n          closable_price: getSpotPrice(detail.ccy),\n        }),\n      );\n    }\n  });\n  positionsApi.data.forEach((x) => {\n    const direction =\n      x.posSide === 'long' ? 'LONG' : x.posSide === 'short' ? 'SHORT' : +x.pos > 0 ? 'LONG' : 'SHORT';\n    const volume = Math.abs(+x.pos);\n    const product_id = encodePath(x.instType, x.instId);\n    const closable_price = +x.last;\n    const valuation =\n      (mapProductIdToProduct.get(product_id)?.value_scale ?? 1) * volume * closable_price || 0;\n\n    positions.push({\n      position_id: x.posId,\n      datasource_id: 'OKX',\n      product_id,\n      direction,\n      volume: volume,\n      free_volume: +x.availPos,\n      closable_price,\n      position_price: +x.avgPx,\n      floating_profit: +x.upl,\n      valuation,\n    });\n  });\n  return positions;\n};\n"]}

package/dist/strategy-account.js

@@ -2,8 +2,8 @@ import { addAccountMarket, provideAccountInfoService } from '@yuants/data-accoun
 import { Terminal } from '@yuants/protocol';
 import { defer } from 'rxjs';
 import { getStrategyAccountInfo } from './accountInfos';
-import { getDefaultCredential, getGridPositions } from './api/private-api';
 import { getStrategyAccountId } from './accountInfos/uid';
+import { getDefaultCredential, getGridPositions } from './api/private-api';
 const terminal = Terminal.fromNodeEnv();
 const credential = getDefaultCredential();
 defer(async () => {
@@ -28,7 +28,7 @@ defer(async () => {
         egress_token_capacity: 20,
         egress_token_refill_interval: 4000, // 每 4 秒恢复 20 个令牌 (双倍冗余限流)
     });
-    provideAccountInfoService(terminal, strategyAccountId, () => getStrategyAccountInfo(credential), {
+    provideAccountInfoService(terminal, strategyAccountId, () => getStrategyAccountInfo(credential, strategyAccountId), {
         auto_refresh_interval: 5000,
     });
 }).subscribe();

package/dist/strategy-account.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy-account.js","sourceRoot":"","sources":["../src/strategy-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AACxC,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;AAE1C,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEjE,gBAAgB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAEhF,QAAQ,CAAC,MAAM,CAAC,cAAc,CAI5B,wBAAwB,EACxB;QACE,QAAQ,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC;QAClC,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAE;YACxD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B;KACF,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,EAAE;QACF,OAAO;YACL,GAAG,EAAE;gBACH,IAAI,EAAE,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM,gBAAgB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aACnG;SACF,CAAC;IACJ,CAAC,EACD;QACE,qBAAqB,EAAE,EAAE;QACzB,4BAA4B,EAAE,IAAI,EAAE,0BAA0B;KAC/D,CACF,CAAC;IAEF,yBAAyB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE;QAC/F,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC","sourcesContent":["import { addAccountMarket, provideAccountInfoService } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { defer } from 'rxjs';\nimport { getStrategyAccountInfo } from './accountInfos';\nimport { getDefaultCredential, getGridPositions } from './api/private-api';\nimport { getStrategyAccountId } from './accountInfos/uid';\n\nconst terminal = Terminal.fromNodeEnv();\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const strategyAccountId = await getStrategyAccountId(credential);\n\n  addAccountMarket(terminal, { account_id: strategyAccountId, market_id: 'OKX' });\n\n  terminal.server.provideService<\n    { account_id: string; algoId: string },\n    Awaited<ReturnType<typeof getGridPositions>>\n  >(\n    `OKX/QueryGridPositions`,\n    {\n      required: ['account_id', 'algoId'],\n      properties: {\n        account_id: { type: 'string', const: strategyAccountId },\n        algoId: { type: 'string' },\n      },\n    },\n    async (msg) => {\n      //\n      return {\n        res: {\n          code: 0,\n          message: 'OK',\n          data: await getGridPositions(credential, { algoOrdType: 'contract_grid', algoId: msg.req.algoId }),\n        },\n      };\n    },\n    {\n      egress_token_capacity: 20,\n      egress_token_refill_interval: 4000, // 每 4 秒恢复 20 个令牌 (双倍冗余限流)\n    },\n  );\n\n  provideAccountInfoService(terminal, strategyAccountId, () => getStrategyAccountInfo(credential), {\n    auto_refresh_interval: 5000,\n  });\n}).subscribe();\n"]}
+{"version":3,"file":"strategy-account.js","sourceRoot":"","sources":["../src/strategy-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;AACxC,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;AAE1C,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEjE,gBAAgB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAEhF,QAAQ,CAAC,MAAM,CAAC,cAAc,CAI5B,wBAAwB,EACxB;QACE,QAAQ,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC;QAClC,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAE;YACxD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B;KACF,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,EAAE;QACF,OAAO;YACL,GAAG,EAAE;gBACH,IAAI,EAAE,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM,gBAAgB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aACnG;SACF,CAAC;IACJ,CAAC,EACD;QACE,qBAAqB,EAAE,EAAE;QACzB,4BAA4B,EAAE,IAAI,EAAE,0BAA0B;KAC/D,CACF,CAAC;IAEF,yBAAyB,CACvB,QAAQ,EACR,iBAAiB,EACjB,GAAG,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAC3D;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC","sourcesContent":["import { addAccountMarket, provideAccountInfoService } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { defer } from 'rxjs';\nimport { getStrategyAccountInfo } from './accountInfos';\nimport { getStrategyAccountId } from './accountInfos/uid';\nimport { getDefaultCredential, getGridPositions } from './api/private-api';\n\nconst terminal = Terminal.fromNodeEnv();\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const strategyAccountId = await getStrategyAccountId(credential);\n\n  addAccountMarket(terminal, { account_id: strategyAccountId, market_id: 'OKX' });\n\n  terminal.server.provideService<\n    { account_id: string; algoId: string },\n    Awaited<ReturnType<typeof getGridPositions>>\n  >(\n    `OKX/QueryGridPositions`,\n    {\n      required: ['account_id', 'algoId'],\n      properties: {\n        account_id: { type: 'string', const: strategyAccountId },\n        algoId: { type: 'string' },\n      },\n    },\n    async (msg) => {\n      //\n      return {\n        res: {\n          code: 0,\n          message: 'OK',\n          data: await getGridPositions(credential, { algoOrdType: 'contract_grid', algoId: msg.req.algoId }),\n        },\n      };\n    },\n    {\n      egress_token_capacity: 20,\n      egress_token_refill_interval: 4000, // 每 4 秒恢复 20 个令牌 (双倍冗余限流)\n    },\n  );\n\n  provideAccountInfoService(\n    terminal,\n    strategyAccountId,\n    () => getStrategyAccountInfo(credential, strategyAccountId),\n    {\n      auto_refresh_interval: 5000,\n    },\n  );\n}).subscribe();\n"]}

package/lib/account-actions-with-credential.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const data_account_1 = require("@yuants/data-account");
 const protocol_1 = require("@yuants/protocol");
-const uid_1 = require("./accountInfos/uid");
 const accountInfos_1 = require("./accountInfos");
+const uid_1 = require("./accountInfos/uid");
 (0, data_account_1.provideAccountActionsWithCredential)(protocol_1.Terminal.fromNodeEnv(), 'OKX', {
     type: 'object',
     required: ['access_key', 'secret_key', 'passphrase'],
@@ -25,15 +25,15 @@ const accountInfos_1 = require("./accountInfos");
             throw new Error('Failed to get account IDs');
         switch (account_id) {
             case accountIds.trading:
-                return (0, accountInfos_1.getTradingAccountInfo)(credential);
+                return (0, accountInfos_1.getTradingAccountInfo)(credential, account_id);
             case accountIds.funding:
-                return (0, accountInfos_1.getFundingAccountInfo)(credential);
+                return (0, accountInfos_1.getFundingAccountInfo)(credential, account_id);
             case accountIds.earning:
-                return (0, accountInfos_1.getEarningAccountInfo)(credential);
+                return (0, accountInfos_1.getEarningAccountInfo)(credential, account_id);
             case accountIds.loan:
-                return (0, accountInfos_1.getLoanAccountInfo)(credential);
+                return (0, accountInfos_1.getLoanAccountInfo)(credential, account_id);
             case accountIds.strategy:
-                return (0, accountInfos_1.getStrategyAccountInfo)(credential);
+                return (0, accountInfos_1.getStrategyAccountInfo)(credential, account_id);
         }
         throw new Error(`Unsupported account_id: ${account_id}`);
     },

package/lib/account-actions-with-credential.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-actions-with-credential.js","sourceRoot":"","sources":["../src/account-actions-with-credential.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,+CAA4C;AAE5C,4CAAmD;AACnD,iDAMwB;AAExB,IAAA,kDAAmC,EACjC,mBAAQ,CAAC,WAAW,EAAE,EACtB,KAAK,EACL;IACE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC;IACpD,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;CACF,EACD;IACE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,QAAQ,UAAU,EAAE;YAClB,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,UAAU,CAAC,IAAI;gBAClB,OAAO,IAAA,iCAAkB,EAAC,UAAU,CAAC,CAAC;YACxC,KAAK,UAAU,CAAC,QAAQ;gBACtB,OAAO,IAAA,qCAAsB,EAAC,UAAU,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CACF,CAAC","sourcesContent":["import { provideAccountActionsWithCredential } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { ICredential } from './api/private-api';\nimport { getAccountIds } from './accountInfos/uid';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getStrategyAccountInfo,\n  getTradingAccountInfo,\n} from './accountInfos';\n\nprovideAccountActionsWithCredential<ICredential>(\n  Terminal.fromNodeEnv(),\n  'OKX',\n  {\n    type: 'object',\n    required: ['access_key', 'secret_key', 'passphrase'],\n    properties: {\n      access_key: { type: 'string' },\n      secret_key: { type: 'string' },\n      passphrase: { type: 'string' },\n    },\n  },\n  {\n    listAccounts: async (credential) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      return Object.values(accountIds).map((account_id) => ({ account_id }));\n    },\n    getAccountInfo: async (credential, account_id) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      switch (account_id) {\n        case accountIds.trading:\n          return getTradingAccountInfo(credential);\n        case accountIds.funding:\n          return getFundingAccountInfo(credential);\n        case accountIds.earning:\n          return getEarningAccountInfo(credential);\n        case accountIds.loan:\n          return getLoanAccountInfo(credential);\n        case accountIds.strategy:\n          return getStrategyAccountInfo(credential);\n      }\n      throw new Error(`Unsupported account_id: ${account_id}`);\n    },\n  },\n);\n"]}
+{"version":3,"file":"account-actions-with-credential.js","sourceRoot":"","sources":["../src/account-actions-with-credential.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,+CAA4C;AAC5C,iDAMwB;AACxB,4CAAmD;AAGnD,IAAA,kDAAmC,EACjC,mBAAQ,CAAC,WAAW,EAAE,EACtB,KAAK,EACL;IACE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC;IACpD,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;CACF,EACD;IACE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,QAAQ,UAAU,EAAE;YAClB,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,OAAO;gBACrB,OAAO,IAAA,oCAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,KAAK,UAAU,CAAC,IAAI;gBAClB,OAAO,IAAA,iCAAkB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACpD,KAAK,UAAU,CAAC,QAAQ;gBACtB,OAAO,IAAA,qCAAsB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACzD;QACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CACF,CAAC","sourcesContent":["import { provideAccountActionsWithCredential } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport {\n  getEarningAccountInfo,\n  getFundingAccountInfo,\n  getLoanAccountInfo,\n  getStrategyAccountInfo,\n  getTradingAccountInfo,\n} from './accountInfos';\nimport { getAccountIds } from './accountInfos/uid';\nimport { ICredential } from './api/private-api';\n\nprovideAccountActionsWithCredential<ICredential>(\n  Terminal.fromNodeEnv(),\n  'OKX',\n  {\n    type: 'object',\n    required: ['access_key', 'secret_key', 'passphrase'],\n    properties: {\n      access_key: { type: 'string' },\n      secret_key: { type: 'string' },\n      passphrase: { type: 'string' },\n    },\n  },\n  {\n    listAccounts: async (credential) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      return Object.values(accountIds).map((account_id) => ({ account_id }));\n    },\n    getAccountInfo: async (credential, account_id) => {\n      const accountIds = await getAccountIds(credential);\n      if (!accountIds) throw new Error('Failed to get account IDs');\n      switch (account_id) {\n        case accountIds.trading:\n          return getTradingAccountInfo(credential, account_id);\n        case accountIds.funding:\n          return getFundingAccountInfo(credential, account_id);\n        case accountIds.earning:\n          return getEarningAccountInfo(credential, account_id);\n        case accountIds.loan:\n          return getLoanAccountInfo(credential, account_id);\n        case accountIds.strategy:\n          return getStrategyAccountInfo(credential, account_id);\n      }\n      throw new Error(`Unsupported account_id: ${account_id}`);\n    },\n  },\n);\n"]}

package/lib/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAqDxB,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAyExB,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/lib/account.js

@@ -21,25 +21,25 @@ const credential = (0, private_api_1.getDefaultCredential)();
 (0, rxjs_1.defer)(async () => {
     const tradingAccountId = await (0, uid_1.getTradingAccountId)(credential);
     (0, data_account_1.addAccountMarket)(terminal, { account_id: tradingAccountId, market_id: 'OKX' });
-    (0, data_account_1.provideAccountInfoService)(terminal, tradingAccountId, () => (0, accountInfos_1.getTradingAccountInfo)(credential), {
+    (0, data_account_1.provideAccountInfoService)(terminal, tradingAccountId, () => (0, accountInfos_1.getTradingAccountInfo)(credential, tradingAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();
 (0, rxjs_1.defer)(async () => {
     const fundingAccountId = await (0, uid_1.getFundingAccountId)(credential);
-    (0, data_account_1.provideAccountInfoService)(terminal, fundingAccountId, () => (0, accountInfos_1.getFundingAccountInfo)(credential), {
+    (0, data_account_1.provideAccountInfoService)(terminal, fundingAccountId, () => (0, accountInfos_1.getFundingAccountInfo)(credential, fundingAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();
 (0, rxjs_1.defer)(async () => {
     const earningAccountId = await (0, uid_1.getEarningAccountId)(credential);
-    (0, data_account_1.provideAccountInfoService)(terminal, earningAccountId, () => (0, accountInfos_1.getEarningAccountInfo)(credential), {
+    (0, data_account_1.provideAccountInfoService)(terminal, earningAccountId, () => (0, accountInfos_1.getEarningAccountInfo)(credential, earningAccountId), {
         auto_refresh_interval: 5000,
     });
 }).subscribe();
 (0, rxjs_1.defer)(async () => {
     const loanAccountId = await (0, uid_1.getLoanAccountId)(credential);
-    (0, data_account_1.provideAccountInfoService)(protocol_1.Terminal.fromNodeEnv(), loanAccountId, () => (0, accountInfos_1.getLoanAccountInfo)(credential), {
+    (0, data_account_1.provideAccountInfoService)(protocol_1.Terminal.fromNodeEnv(), loanAccountId, () => (0, accountInfos_1.getLoanAccountInfo)(credential, loanAccountId), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();