@yuants/vendor-binance 0.8.7 → 0.10.0

package/lib/services/accounts/unified.js

@@ -4,7 +4,7 @@ exports.getUnifiedAccountInfo = void 0;
 const utils_1 = require("@yuants/utils");
 const client_1 = require("../../api/client");
 const private_api_1 = require("../../api/private-api");
-const getUnifiedAccountInfo = async (credential, _accountId) => {
+const getUnifiedAccountInfo = async (credential) => {
     const [balanceRes, umAccountRes] = await Promise.all([
         (0, private_api_1.getUnifiedAccountBalance)(credential),
         (0, private_api_1.getUnifiedUmAccount)(credential),
@@ -15,22 +15,12 @@ const getUnifiedAccountInfo = async (credential, _accountId) => {
     if ((0, client_1.isApiError)(umAccountRes)) {
         throw new Error(umAccountRes.msg);
     }
-    const usdtBalance = balanceRes.find((item) => item.asset === 'USDT');
-    if (!usdtBalance) {
-        throw new Error('USDT balance not found');
-    }
-    const usdtAsset = umAccountRes.assets.find((item) => item.asset === 'USDT');
-    if (!usdtAsset) {
-        throw new Error('USDT asset not found in UM account');
-    }
-    const equity = +usdtBalance.totalWalletBalance + +usdtBalance.umUnrealizedPNL;
-    const free = equity - +usdtAsset.initialMargin;
     const positions = umAccountRes.positions
         .filter((position) => +position.positionAmt !== 0)
         .map((position) => ({
         position_id: `${position.symbol}/${position.positionSide}`,
         datasource_id: 'BINANCE',
-        product_id: (0, utils_1.encodePath)('usdt-future', position.symbol),
+        product_id: (0, utils_1.encodePath)('BINANCE', 'USDT-FUTURE', position.symbol),
         direction: position.positionSide === 'LONG'
             ? 'LONG'
             : position.positionSide === 'SHORT'

package/lib/services/accounts/unified.js.map

@@ -1 +1 @@
-{"version":3,"file":"unified.js","sourceRoot":"","sources":["../../../src/services/accounts/unified.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,6CAA8C;AAC9C,uDAAmG;AAE5F,MAAM,qBAAqB,GAAgD,KAAK,EACrF,UAAU,EACV,UAAU,EACV,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,IAAA,sCAAwB,EAAC,UAAU,CAAC;QACpC,IAAA,iCAAmB,EAAC,UAAU,CAAC;KAChC,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,UAAU,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KACjC;IACD,IAAI,IAAA,mBAAU,EAAC,YAAY,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;KACnC;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;IACrE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,kBAAkB,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC;IAC9E,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC;IAE/C,MAAM,SAAS,GAAgB,YAAY,CAAC,SAAS;SAClD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC;SACjD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClB,WAAW,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE;QAC1D,aAAa,EAAE,SAAS;QACxB,UAAU,EAAE,IAAA,kBAAU,EAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtD,SAAS,EACP,QAAQ,CAAC,YAAY,KAAK,MAAM;YAC9B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,QAAQ,CAAC,YAAY,KAAK,OAAO;gBACnC,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,QAAQ,CAAC,YAAY,KAAK,MAAM;oBAClC,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,SAAS;QACf,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW;QAC7B,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW;QAClC,cAAc,EAAE,CAAC,QAAQ,CAAC,UAAU;QACpC,cAAc,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,WAAW;QACzF,eAAe,EAAE,CAAC,QAAQ,CAAC,gBAAgB;QAC3C,SAAS,EACP,CAAC,QAAQ,CAAC,WAAW;YACrB,CAAC,CAAC,QAAQ,CAAC,UAAU;gBACnB,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;KAC5F,CAAC,CAAC,CAAC;IAEN,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AApDW,QAAA,qBAAqB,yBAoDhC","sourcesContent":["import { IActionHandlerOfGetAccountInfo, IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { isApiError } from '../../api/client';\nimport { getUnifiedAccountBalance, getUnifiedUmAccount, ICredential } from '../../api/private-api';\n\nexport const getUnifiedAccountInfo: IActionHandlerOfGetAccountInfo<ICredential> = async (\n  credential,\n  _accountId,\n) => {\n  const [balanceRes, umAccountRes] = await Promise.all([\n    getUnifiedAccountBalance(credential),\n    getUnifiedUmAccount(credential),\n  ]);\n  if (isApiError(balanceRes)) {\n    throw new Error(balanceRes.msg);\n  }\n  if (isApiError(umAccountRes)) {\n    throw new Error(umAccountRes.msg);\n  }\n  const usdtBalance = balanceRes.find((item) => item.asset === 'USDT');\n  if (!usdtBalance) {\n    throw new Error('USDT balance not found');\n  }\n  const usdtAsset = umAccountRes.assets.find((item) => item.asset === 'USDT');\n  if (!usdtAsset) {\n    throw new Error('USDT asset not found in UM account');\n  }\n\n  const equity = +usdtBalance.totalWalletBalance + +usdtBalance.umUnrealizedPNL;\n  const free = equity - +usdtAsset.initialMargin;\n\n  const positions: IPosition[] = umAccountRes.positions\n    .filter((position) => +position.positionAmt !== 0)\n    .map((position) => ({\n      position_id: `${position.symbol}/${position.positionSide}`,\n      datasource_id: 'BINANCE',\n      product_id: encodePath('usdt-future', position.symbol),\n      direction:\n        position.positionSide === 'LONG'\n          ? 'LONG'\n          : position.positionSide === 'SHORT'\n          ? 'SHORT'\n          : position.positionSide === 'BOTH'\n          ? 'BOTH'\n          : 'UNKNOWN',\n      volume: +position.positionAmt,\n      free_volume: +position.positionAmt,\n      position_price: +position.entryPrice,\n      closable_price: +position.entryPrice + +position.unrealizedProfit / +position.positionAmt,\n      floating_profit: +position.unrealizedProfit,\n      valuation:\n        +position.positionAmt *\n        (+position.entryPrice +\n          (+position.positionAmt === 0 ? 0 : +position.unrealizedProfit / +position.positionAmt)),\n    }));\n\n  return positions;\n};\n"]}
+{"version":3,"file":"unified.js","sourceRoot":"","sources":["../../../src/services/accounts/unified.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,6CAA8C;AAC9C,uDAAmG;AAE5F,MAAM,qBAAqB,GAAG,KAAK,EAAE,UAAuB,EAAwB,EAAE;IAC3F,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,IAAA,sCAAwB,EAAC,UAAU,CAAC;QACpC,IAAA,iCAAmB,EAAC,UAAU,CAAC;KAChC,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,UAAU,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KACjC;IACD,IAAI,IAAA,mBAAU,EAAC,YAAY,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;KACnC;IAED,MAAM,SAAS,GAAgB,YAAY,CAAC,SAAS;SAClD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC;SACjD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClB,WAAW,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE;QAC1D,aAAa,EAAE,SAAS;QACxB,UAAU,EAAE,IAAA,kBAAU,EAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC;QACjE,SAAS,EACP,QAAQ,CAAC,YAAY,KAAK,MAAM;YAC9B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,QAAQ,CAAC,YAAY,KAAK,OAAO;gBACnC,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,QAAQ,CAAC,YAAY,KAAK,MAAM;oBAClC,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,SAAS;QACf,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW;QAC7B,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW;QAClC,cAAc,EAAE,CAAC,QAAQ,CAAC,UAAU;QACpC,cAAc,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,WAAW;QACzF,eAAe,EAAE,CAAC,QAAQ,CAAC,gBAAgB;QAC3C,SAAS,EACP,CAAC,QAAQ,CAAC,WAAW;YACrB,CAAC,CAAC,QAAQ,CAAC,UAAU;gBACnB,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;KAC5F,CAAC,CAAC,CAAC;IAEN,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC","sourcesContent":["import { IPosition } from '@yuants/data-account';\nimport { encodePath } from '@yuants/utils';\nimport { isApiError } from '../../api/client';\nimport { getUnifiedAccountBalance, getUnifiedUmAccount, ICredential } from '../../api/private-api';\n\nexport const getUnifiedAccountInfo = async (credential: ICredential): Promise<IPosition[]> => {\n  const [balanceRes, umAccountRes] = await Promise.all([\n    getUnifiedAccountBalance(credential),\n    getUnifiedUmAccount(credential),\n  ]);\n  if (isApiError(balanceRes)) {\n    throw new Error(balanceRes.msg);\n  }\n  if (isApiError(umAccountRes)) {\n    throw new Error(umAccountRes.msg);\n  }\n\n  const positions: IPosition[] = umAccountRes.positions\n    .filter((position) => +position.positionAmt !== 0)\n    .map((position) => ({\n      position_id: `${position.symbol}/${position.positionSide}`,\n      datasource_id: 'BINANCE',\n      product_id: encodePath('BINANCE', 'USDT-FUTURE', position.symbol),\n      direction:\n        position.positionSide === 'LONG'\n          ? 'LONG'\n          : position.positionSide === 'SHORT'\n          ? 'SHORT'\n          : position.positionSide === 'BOTH'\n          ? 'BOTH'\n          : 'UNKNOWN',\n      volume: +position.positionAmt,\n      free_volume: +position.positionAmt,\n      position_price: +position.entryPrice,\n      closable_price: +position.entryPrice + +position.unrealizedProfit / +position.positionAmt,\n      floating_profit: +position.unrealizedProfit,\n      valuation:\n        +position.positionAmt *\n        (+position.entryPrice +\n          (+position.positionAmt === 0 ? 0 : +position.unrealizedProfit / +position.positionAmt)),\n    }));\n\n  return positions;\n};\n"]}

package/lib/services/exchange.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=exchange.d.ts.map

package/lib/services/exchange.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"exchange.d.ts","sourceRoot":"","sources":["../../src/services/exchange.ts"],"names":[],"mappings":""}

package/lib/services/exchange.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const exchange_1 = require("@yuants/exchange");
+const protocol_1 = require("@yuants/protocol");
+const utils_1 = require("@yuants/utils");
+const product_1 = require("../public-data/product");
+const profile_1 = require("./accounts/profile");
+const spot_1 = require("./accounts/spot");
+const unified_1 = require("./accounts/unified");
+const cancelOrder_1 = require("./orders/cancelOrder");
+const listOrders_1 = require("./orders/listOrders");
+const modifyOrder_1 = require("./orders/modifyOrder");
+const submitOrder_1 = require("./orders/submitOrder");
+const terminal = protocol_1.Terminal.fromNodeEnv();
+(0, exchange_1.provideExchangeServices)(terminal, {
+    name: 'BINANCE',
+    credentialSchema: {
+        type: 'object',
+        required: ['access_key', 'secret_key'],
+        properties: {
+            access_key: { type: 'string' },
+            secret_key: { type: 'string' },
+        },
+    },
+    getCredentialId: profile_1.getCredentialId,
+    listProducts: product_1.listProducts,
+    getPositions: async function (credential) {
+        const [uFuturePositions, spotPositions] = await Promise.all([
+            (0, unified_1.getUnifiedAccountInfo)(credential),
+            (0, spot_1.getSpotAccountInfoSnapshot)(credential),
+        ]);
+        return [...uFuturePositions, ...spotPositions];
+    },
+    getOrders: async function (credential) {
+        const [umOrders, spotOrders] = await Promise.all([
+            (0, listOrders_1.listUnifiedUmOrders)(credential),
+            (0, listOrders_1.listSpotOrders)(credential),
+        ]);
+        return [...umOrders, ...spotOrders];
+    },
+    getPositionsByProductId: async function (credential, product_id) {
+        const [_, instType] = (0, utils_1.decodePath)(product_id); // BINANCE/USDT-FUTURE/ADAUSDT
+        if (instType === 'SPOT') {
+            const positions = await (0, spot_1.getSpotAccountInfoSnapshot)(credential);
+            return positions.filter((position) => position.product_id === product_id);
+        }
+        if (instType === 'USDT-FUTURE') {
+            const positions = await (0, unified_1.getUnifiedAccountInfo)(credential);
+            return positions.filter((position) => position.product_id === product_id);
+        }
+        throw new Error(`Unsupported instType: ${instType}`);
+    },
+    getOrdersByProductId: listOrders_1.getOrdersByProductId,
+    submitOrder: submitOrder_1.submitOrder,
+    modifyOrder: modifyOrder_1.modifyOrder,
+    cancelOrder: cancelOrder_1.cancelOrder,
+});
+//# sourceMappingURL=exchange.js.map

package/lib/services/exchange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../../src/services/exchange.ts"],"names":[],"mappings":";;AAEA,+CAA2D;AAC3D,+CAA4C;AAC5C,yCAA2C;AAE3C,oDAAsD;AACtD,gDAAqD;AACrD,0CAA6D;AAC7D,gDAA2D;AAC3D,sDAAmD;AACnD,oDAAgG;AAChG,sDAAmD;AACnD,sDAAmD;AAEnD,MAAM,QAAQ,GAAG,mBAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,IAAA,kCAAuB,EAAc,QAAQ,EAAE;IAC7C,IAAI,EAAE,SAAS;IACf,gBAAgB,EAAE;QAChB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC;QACtC,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC/B;KACF;IACD,eAAe,EAAf,yBAAe;IACf,YAAY,EAAZ,sBAAY;IACZ,YAAY,EAAE,KAAK,WAAW,UAAuB;QACnD,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1D,IAAA,+BAAqB,EAAC,UAAU,CAAC;YACjC,IAAA,iCAA0B,EAAC,UAAU,CAAC;SACvC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,aAAa,CAAC,CAAC;IACjD,CAAC;IACD,SAAS,EAAE,KAAK,WAAW,UAAuB;QAChD,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,IAAA,gCAAmB,EAAC,UAAU,CAAC;YAC/B,IAAA,2BAAc,EAAC,UAAU,CAAC;SAC3B,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;IACtC,CAAC;IACD,uBAAuB,EAAE,KAAK,WAC5B,UAAuB,EACvB,UAAkB;QAElB,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC,CAAC,8BAA8B;QAC5E,IAAI,QAAQ,KAAK,MAAM,EAAE;YACvB,MAAM,SAAS,GAAG,MAAM,IAAA,iCAA0B,EAAC,UAAU,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;SAC3E;QACD,IAAI,QAAQ,KAAK,aAAa,EAAE;YAC9B,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAqB,EAAC,UAAU,CAAC,CAAC;YAC1D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;SAC3E;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IACD,oBAAoB,EAApB,iCAAoB;IACpB,WAAW,EAAX,yBAAW;IACX,WAAW,EAAX,yBAAW;IACX,WAAW,EAAX,yBAAW;CACZ,CAAC,CAAC","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 { ICredential } from '../api/client';\nimport { listProducts } from '../public-data/product';\nimport { getCredentialId } from './accounts/profile';\nimport { getSpotAccountInfoSnapshot } from './accounts/spot';\nimport { getUnifiedAccountInfo } from './accounts/unified';\nimport { cancelOrder } from './orders/cancelOrder';\nimport { getOrdersByProductId, listSpotOrders, listUnifiedUmOrders } from './orders/listOrders';\nimport { modifyOrder } from './orders/modifyOrder';\nimport { submitOrder } from './orders/submitOrder';\n\nconst terminal = Terminal.fromNodeEnv();\n\nprovideExchangeServices<ICredential>(terminal, {\n  name: 'BINANCE',\n  credentialSchema: {\n    type: 'object',\n    required: ['access_key', 'secret_key'],\n    properties: {\n      access_key: { type: 'string' },\n      secret_key: { type: 'string' },\n    },\n  },\n  getCredentialId,\n  listProducts,\n  getPositions: async function (credential: ICredential): Promise<IPosition[]> {\n    const [uFuturePositions, spotPositions] = await Promise.all([\n      getUnifiedAccountInfo(credential),\n      getSpotAccountInfoSnapshot(credential),\n    ]);\n    return [...uFuturePositions, ...spotPositions];\n  },\n  getOrders: async function (credential: ICredential): Promise<IOrder[]> {\n    const [umOrders, spotOrders] = await Promise.all([\n      listUnifiedUmOrders(credential),\n      listSpotOrders(credential),\n    ]);\n    return [...umOrders, ...spotOrders];\n  },\n  getPositionsByProductId: async function (\n    credential: ICredential,\n    product_id: string,\n  ): Promise<IPosition[]> {\n    const [_, instType] = decodePath(product_id); // BINANCE/USDT-FUTURE/ADAUSDT\n    if (instType === 'SPOT') {\n      const positions = await getSpotAccountInfoSnapshot(credential);\n      return positions.filter((position) => position.product_id === product_id);\n    }\n    if (instType === 'USDT-FUTURE') {\n      const positions = await getUnifiedAccountInfo(credential);\n      return positions.filter((position) => position.product_id === product_id);\n    }\n    throw new Error(`Unsupported instType: ${instType}`);\n  },\n  getOrdersByProductId,\n  submitOrder,\n  modifyOrder,\n  cancelOrder,\n});\n"]}

package/lib/services/orders/cancelOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancelOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAkC,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA+BpF,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAQhE,CAAC"}
+{"version":3,"file":"cancelOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAkC,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAgCpF,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAShE,CAAC"}

package/lib/services/orders/cancelOrder.js

@@ -4,6 +4,7 @@ exports.cancelOrder = void 0;
 const client_1 = require("../../api/client");
 const private_api_1 = require("../../api/private-api");
 const order_utils_1 = require("./order-utils");
+const utils_1 = require("@yuants/utils");
 const cancelUnifiedOrder = async (credential, order) => {
     if (!order.order_id) {
         throw new Error('Binance cancelOrder requires order_id');
@@ -31,13 +32,14 @@ const cancelSpotOrder = async (credential, order) => {
     }
 };
 const cancelOrder = async (credential, order) => {
-    if (order.account_id.includes('/unified/')) {
+    const [, TYPE] = (0, utils_1.decodePath)(order.product_id);
+    if (TYPE === 'USDT-FUTURE') {
         return cancelUnifiedOrder(credential, order);
     }
-    if (order.account_id.includes('/spot/')) {
+    if (TYPE === 'SPOT') {
         return cancelSpotOrder(credential, order);
     }
-    throw new Error(`Unsupported account_id for cancelOrder: ${order.account_id}`);
+    throw (0, utils_1.newError)('BINANCE_CANCEL_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });
 };
 exports.cancelOrder = cancelOrder;
 //# sourceMappingURL=cancelOrder.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cancelOrder.js","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":";;;AACA,6CAA8C;AAC9C,uDAAoF;AACpF,+CAAqE;AAErE,MAAM,kBAAkB,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC1D;IACD,MAAM,MAAM,GAAG,IAAA,gCAAkB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAa,EAAC,UAAU,EAAE;QAC1C,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAChF;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC5F,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC1D;IACD,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAe,EAAC,UAAU,EAAE;QAC5C,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAC7E;AACH,CAAC,CAAC;AAEK,MAAM,WAAW,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC1C,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC9C;IACD,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACvC,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC3C;IACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;AACjF,CAAC,CAAC;AARW,QAAA,WAAW,eAQtB","sourcesContent":["import { IActionHandlerOfCancelOrder } from '@yuants/data-order';\nimport { isApiError } from '../../api/client';\nimport { deleteSpotOrder, deleteUmOrder, ICredential } from '../../api/private-api';\nimport { decodeFutureSymbol, decodeSpotSymbol } from './order-utils';\n\nconst cancelUnifiedOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('Binance cancelOrder requires order_id');\n  }\n  const symbol = decodeFutureSymbol(order.product_id);\n  const res = await deleteUmOrder(credential, {\n    symbol,\n    orderId: order.order_id,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance cancel unified order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nconst cancelSpotOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('Binance cancelOrder requires order_id');\n  }\n  const symbol = decodeSpotSymbol(order.product_id);\n  const res = await deleteSpotOrder(credential, {\n    symbol,\n    orderId: order.order_id,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance cancel spot order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nexport const cancelOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (order.account_id.includes('/unified/')) {\n    return cancelUnifiedOrder(credential, order);\n  }\n  if (order.account_id.includes('/spot/')) {\n    return cancelSpotOrder(credential, order);\n  }\n  throw new Error(`Unsupported account_id for cancelOrder: ${order.account_id}`);\n};\n"]}
+{"version":3,"file":"cancelOrder.js","sourceRoot":"","sources":["../../../src/services/orders/cancelOrder.ts"],"names":[],"mappings":";;;AACA,6CAA8C;AAC9C,uDAAoF;AACpF,+CAAqE;AACrE,yCAAqD;AAErD,MAAM,kBAAkB,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC1D;IACD,MAAM,MAAM,GAAG,IAAA,gCAAkB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAa,EAAC,UAAU,EAAE;QAC1C,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAChF;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC5F,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC1D;IACD,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAe,EAAC,UAAU,EAAE;QAC5C,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAC7E;AACH,CAAC,CAAC;AAEK,MAAM,WAAW,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9C,IAAI,IAAI,KAAK,aAAa,EAAE;QAC1B,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC9C;IACD,IAAI,IAAI,KAAK,MAAM,EAAE;QACnB,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC3C;IACD,MAAM,IAAA,gBAAQ,EAAC,+CAA+C,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAC7E,CAAC,CAAC;AATW,QAAA,WAAW,eAStB","sourcesContent":["import { IActionHandlerOfCancelOrder } from '@yuants/data-order';\nimport { isApiError } from '../../api/client';\nimport { deleteSpotOrder, deleteUmOrder, ICredential } from '../../api/private-api';\nimport { decodeFutureSymbol, decodeSpotSymbol } from './order-utils';\nimport { decodePath, newError } from '@yuants/utils';\n\nconst cancelUnifiedOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('Binance cancelOrder requires order_id');\n  }\n  const symbol = decodeFutureSymbol(order.product_id);\n  const res = await deleteUmOrder(credential, {\n    symbol,\n    orderId: order.order_id,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance cancel unified order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nconst cancelSpotOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  if (!order.order_id) {\n    throw new Error('Binance cancelOrder requires order_id');\n  }\n  const symbol = decodeSpotSymbol(order.product_id);\n  const res = await deleteSpotOrder(credential, {\n    symbol,\n    orderId: order.order_id,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance cancel spot order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nexport const cancelOrder: IActionHandlerOfCancelOrder<ICredential> = async (credential, order) => {\n  const [, TYPE] = decodePath(order.product_id);\n  if (TYPE === 'USDT-FUTURE') {\n    return cancelUnifiedOrder(credential, order);\n  }\n  if (TYPE === 'SPOT') {\n    return cancelSpotOrder(credential, order);\n  }\n  throw newError('BINANCE_CANCEL_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });\n};\n"]}

package/lib/services/orders/listOrders.d.ts

@@ -1,4 +1,6 @@
-import { IActionHandlerOfListOrders } from '@yuants/data-order';
+import { IOrder } from '@yuants/data-order';
 import { ICredential } from '../../api/private-api';
-export declare const listOrders: IActionHandlerOfListOrders<ICredential>;
+export declare const listUnifiedUmOrders: (credential: ICredential) => Promise<IOrder[]>;
+export declare const listSpotOrders: (credential: ICredential) => Promise<IOrder[]>;
+export declare const getOrdersByProductId: (credential: ICredential, product_id: string) => Promise<IOrder[]>;
 //# sourceMappingURL=listOrders.d.ts.map

package/lib/services/orders/listOrders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listOrders.d.ts","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAU,MAAM,oBAAoB,CAAC;AAGxE,OAAO,EAA6C,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQ/F,eAAO,MAAM,UAAU,EAAE,0BAA0B,CAAC,WAAW,CA8C9D,CAAC"}
+{"version":3,"file":"listOrders.d.ts","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGxE,OAAO,EAA6C,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQ/F,eAAO,MAAM,mBAAmB,eAAsB,WAAW,KAAG,QAAQ,MAAM,EAAE,CAsBnF,CAAC;AAEF,eAAO,MAAM,cAAc,eAAsB,WAAW,KAAG,QAAQ,MAAM,EAAE,CAoB9E,CAAC;AAEF,eAAO,MAAM,oBAAoB,eACnB,WAAW,cACX,MAAM,KACjB,QAAQ,MAAM,EAAE,CAWlB,CAAC"}

package/lib/services/orders/listOrders.js

@@ -1,53 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listOrders = void 0;
+exports.getOrdersByProductId = exports.listSpotOrders = exports.listUnifiedUmOrders = void 0;
 const utils_1 = require("@yuants/utils");
 const client_1 = require("../../api/client");
 const private_api_1 = require("../../api/private-api");
 const order_utils_1 = require("./order-utils");
-const listOrders = async (credential, account_id) => {
-    if (account_id.includes('/unified/')) {
-        const res = await (0, private_api_1.getUnifiedUmOpenOrders)(credential);
-        if ((0, client_1.isApiError)(res)) {
-            throw new Error(res.msg);
-        }
-        return res.map((order) => {
-            var _a;
-            return ({
-                order_id: `${order.orderId}`,
-                account_id,
-                product_id: (0, utils_1.encodePath)('usdt-future', order.symbol),
-                order_type: (0, order_utils_1.mapBinanceOrderTypeToYuants)(order.type),
-                order_direction: (_a = (0, order_utils_1.mapBinanceSideToYuantsDirection)(order.side, order.positionSide)) !== null && _a !== void 0 ? _a : (order.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT'),
-                volume: +order.origQty,
-                traded_volume: +order.executedQty,
-                price: order.price === undefined ? undefined : +order.price,
-                submit_at: order.time,
-                updated_at: (0, utils_1.formatTime)(order.updateTime),
-                order_status: (0, order_utils_1.mapBinanceOrderStatus)(order.status),
-            });
-        });
+const listUnifiedUmOrders = async (credential) => {
+    const res = await (0, private_api_1.getUnifiedUmOpenOrders)(credential);
+    if ((0, client_1.isApiError)(res)) {
+        throw new Error(res.msg);
     }
-    if (account_id.includes('/spot/')) {
-        const res = await (0, private_api_1.getSpotOpenOrders)(credential);
-        if ((0, client_1.isApiError)(res)) {
-            throw new Error(res.msg);
-        }
-        return res.map((order) => ({
+    return res.map((order) => {
+        var _a;
+        return ({
             order_id: `${order.orderId}`,
-            account_id,
-            product_id: (0, utils_1.encodePath)('spot', order.symbol),
+            account_id: '',
+            product_id: (0, utils_1.encodePath)('BINANCE', 'USDT-FUTURE', order.symbol),
             order_type: (0, order_utils_1.mapBinanceOrderTypeToYuants)(order.type),
-            order_direction: (0, order_utils_1.mapSpotSideToOrderDirection)(order.side),
+            order_direction: (_a = (0, order_utils_1.mapBinanceSideToYuantsDirection)(order.side, order.positionSide)) !== null && _a !== void 0 ? _a : (order.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT'),
             volume: +order.origQty,
             traded_volume: +order.executedQty,
-            price: order.price ? +order.price : undefined,
+            price: order.price === undefined ? undefined : +order.price,
             submit_at: order.time,
             updated_at: (0, utils_1.formatTime)(order.updateTime),
             order_status: (0, order_utils_1.mapBinanceOrderStatus)(order.status),
-        }));
+        });
+    });
+};
+exports.listUnifiedUmOrders = listUnifiedUmOrders;
+const listSpotOrders = async (credential) => {
+    const res = await (0, private_api_1.getSpotOpenOrders)(credential);
+    if ((0, client_1.isApiError)(res)) {
+        throw new Error(res.msg);
+    }
+    return res.map((order) => ({
+        order_id: `${order.orderId}`,
+        account_id: '',
+        product_id: (0, utils_1.encodePath)('BINANCE', 'SPOT', order.symbol),
+        order_type: (0, order_utils_1.mapBinanceOrderTypeToYuants)(order.type),
+        order_direction: (0, order_utils_1.mapSpotSideToOrderDirection)(order.side),
+        volume: +order.origQty,
+        traded_volume: +order.executedQty,
+        price: order.price === undefined ? undefined : +order.price,
+        submit_at: order.time,
+        updated_at: (0, utils_1.formatTime)(order.updateTime),
+        order_status: (0, order_utils_1.mapBinanceOrderStatus)(order.status),
+    }));
+};
+exports.listSpotOrders = listSpotOrders;
+const getOrdersByProductId = async function (credential, product_id) {
+    const [_, instType] = (0, utils_1.decodePath)(product_id); // BINANCE/USDT-FUTURE/ADAUSDT
+    if (instType === 'SPOT') {
+        const orders = await (0, exports.listSpotOrders)(credential);
+        return orders.filter((order) => order.product_id === product_id);
+    }
+    if (instType === 'USDT-FUTURE') {
+        const orders = await (0, exports.listUnifiedUmOrders)(credential);
+        return orders.filter((order) => order.product_id === product_id);
     }
-    throw new Error(`Unsupported account_id for listOrders: ${account_id}`);
+    throw new Error(`Unsupported instType: ${instType}`);
 };
-exports.listOrders = listOrders;
+exports.getOrdersByProductId = getOrdersByProductId;
 //# sourceMappingURL=listOrders.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"listOrders.js","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":";;;AACA,yCAAuD;AACvD,6CAA8C;AAC9C,uDAA+F;AAC/F,+CAKuB;AAEhB,MAAM,UAAU,GAA4C,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;IAClG,IAAI,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,IAAA,oCAAsB,EAAC,UAAU,CAAC,CAAC;QACrD,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,OAAO,GAAG,CAAC,GAAG,CACZ,CAAC,KAAK,EAAU,EAAE;;YAAC,OAAA,CAAC;gBAClB,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;gBAC5B,UAAU;gBACV,UAAU,EAAE,IAAA,kBAAU,EAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnD,UAAU,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;gBACnD,eAAe,EACb,MAAA,IAAA,6CAA+B,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,mCAC/D,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;gBACrD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO;gBACtB,aAAa,EAAE,CAAC,KAAK,CAAC,WAAW;gBACjC,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;gBAC3D,SAAS,EAAE,KAAK,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC;gBACxC,YAAY,EAAE,IAAA,mCAAqB,EAAC,KAAK,CAAC,MAAM,CAAC;aAClD,CAAC,CAAA;SAAA,CACH,CAAC;KACH;IACD,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,IAAA,+BAAiB,EAAC,UAAU,CAAC,CAAC;QAChD,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,OAAO,GAAG,CAAC,GAAG,CACZ,CAAC,KAAK,EAAU,EAAE,CAAC,CAAC;YAClB,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;YAC5B,UAAU;YACV,UAAU,EAAE,IAAA,kBAAU,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YAC5C,UAAU,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;YACnD,eAAe,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;YACxD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO;YACtB,aAAa,EAAE,CAAC,KAAK,CAAC,WAAW;YACjC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAC7C,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC;YACxC,YAAY,EAAE,IAAA,mCAAqB,EAAC,KAAK,CAAC,MAAM,CAAC;SAClD,CAAC,CACH,CAAC;KACH;IACD,MAAM,IAAI,KAAK,CAAC,0CAA0C,UAAU,EAAE,CAAC,CAAC;AAC1E,CAAC,CAAC;AA9CW,QAAA,UAAU,cA8CrB","sourcesContent":["import { IActionHandlerOfListOrders, IOrder } from '@yuants/data-order';\nimport { encodePath, formatTime } from '@yuants/utils';\nimport { isApiError } from '../../api/client';\nimport { getSpotOpenOrders, getUnifiedUmOpenOrders, ICredential } from '../../api/private-api';\nimport {\n  mapBinanceOrderStatus,\n  mapBinanceOrderTypeToYuants,\n  mapBinanceSideToYuantsDirection,\n  mapSpotSideToOrderDirection,\n} from './order-utils';\n\nexport const listOrders: IActionHandlerOfListOrders<ICredential> = async (credential, account_id) => {\n  if (account_id.includes('/unified/')) {\n    const res = await getUnifiedUmOpenOrders(credential);\n    if (isApiError(res)) {\n      throw new Error(res.msg);\n    }\n    return res.map(\n      (order): IOrder => ({\n        order_id: `${order.orderId}`,\n        account_id,\n        product_id: encodePath('usdt-future', order.symbol),\n        order_type: mapBinanceOrderTypeToYuants(order.type),\n        order_direction:\n          mapBinanceSideToYuantsDirection(order.side, order.positionSide) ??\n          (order.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT'),\n        volume: +order.origQty,\n        traded_volume: +order.executedQty,\n        price: order.price === undefined ? undefined : +order.price,\n        submit_at: order.time,\n        updated_at: formatTime(order.updateTime),\n        order_status: mapBinanceOrderStatus(order.status),\n      }),\n    );\n  }\n  if (account_id.includes('/spot/')) {\n    const res = await getSpotOpenOrders(credential);\n    if (isApiError(res)) {\n      throw new Error(res.msg);\n    }\n    return res.map(\n      (order): IOrder => ({\n        order_id: `${order.orderId}`,\n        account_id,\n        product_id: encodePath('spot', order.symbol),\n        order_type: mapBinanceOrderTypeToYuants(order.type),\n        order_direction: mapSpotSideToOrderDirection(order.side),\n        volume: +order.origQty,\n        traded_volume: +order.executedQty,\n        price: order.price ? +order.price : undefined,\n        submit_at: order.time,\n        updated_at: formatTime(order.updateTime),\n        order_status: mapBinanceOrderStatus(order.status),\n      }),\n    );\n  }\n  throw new Error(`Unsupported account_id for listOrders: ${account_id}`);\n};\n"]}
+{"version":3,"file":"listOrders.js","sourceRoot":"","sources":["../../../src/services/orders/listOrders.ts"],"names":[],"mappings":";;;AACA,yCAAmE;AACnE,6CAA8C;AAC9C,uDAA+F;AAC/F,+CAKuB;AAEhB,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAuB,EAAqB,EAAE;IACtF,MAAM,GAAG,GAAG,MAAM,IAAA,oCAAsB,EAAC,UAAU,CAAC,CAAC;IACrD,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC,GAAG,CACZ,CAAC,KAAK,EAAU,EAAE;;QAAC,OAAA,CAAC;YAClB,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;YAC5B,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,IAAA,kBAAU,EAAC,SAAS,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC9D,UAAU,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;YACnD,eAAe,EACb,MAAA,IAAA,6CAA+B,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,mCAC/D,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;YACrD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO;YACtB,aAAa,EAAE,CAAC,KAAK,CAAC,WAAW;YACjC,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;YAC3D,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC;YACxC,YAAY,EAAE,IAAA,mCAAqB,EAAC,KAAK,CAAC,MAAM,CAAC;SAClD,CAAC,CAAA;KAAA,CACH,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,UAAuB,EAAqB,EAAE;IACjF,MAAM,GAAG,GAAG,MAAM,IAAA,+BAAiB,EAAC,UAAU,CAAC,CAAC;IAChD,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC,GAAG,CACZ,CAAC,KAAK,EAAU,EAAE,CAAC,CAAC;QAClB,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;QAC5B,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,IAAA,kBAAU,EAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;QACvD,UAAU,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;QACnD,eAAe,EAAE,IAAA,yCAA2B,EAAC,KAAK,CAAC,IAAI,CAAC;QACxD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO;QACtB,aAAa,EAAE,CAAC,KAAK,CAAC,WAAW;QACjC,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;QAC3D,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,UAAU,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC;QACxC,YAAY,EAAE,IAAA,mCAAqB,EAAC,KAAK,CAAC,MAAM,CAAC;KAClD,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,cAAc,kBAoBzB;AAEK,MAAM,oBAAoB,GAAG,KAAK,WACvC,UAAuB,EACvB,UAAkB;IAElB,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC,CAAC,8BAA8B;IAC5E,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAc,EAAC,UAAU,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;KAClE;IACD,IAAI,QAAQ,KAAK,aAAa,EAAE;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAmB,EAAC,UAAU,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;KAClE;IACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAdW,QAAA,oBAAoB,wBAc/B","sourcesContent":["import { IActionHandlerOfListOrders, IOrder } from '@yuants/data-order';\nimport { decodePath, encodePath, formatTime } from '@yuants/utils';\nimport { isApiError } from '../../api/client';\nimport { getSpotOpenOrders, getUnifiedUmOpenOrders, ICredential } from '../../api/private-api';\nimport {\n  mapBinanceOrderStatus,\n  mapBinanceOrderTypeToYuants,\n  mapBinanceSideToYuantsDirection,\n  mapSpotSideToOrderDirection,\n} from './order-utils';\n\nexport const listUnifiedUmOrders = async (credential: ICredential): Promise<IOrder[]> => {\n  const res = await getUnifiedUmOpenOrders(credential);\n  if (isApiError(res)) {\n    throw new Error(res.msg);\n  }\n  return res.map(\n    (order): IOrder => ({\n      order_id: `${order.orderId}`,\n      account_id: '',\n      product_id: encodePath('BINANCE', 'USDT-FUTURE', order.symbol),\n      order_type: mapBinanceOrderTypeToYuants(order.type),\n      order_direction:\n        mapBinanceSideToYuantsDirection(order.side, order.positionSide) ??\n        (order.side === 'BUY' ? 'OPEN_LONG' : 'OPEN_SHORT'),\n      volume: +order.origQty,\n      traded_volume: +order.executedQty,\n      price: order.price === undefined ? undefined : +order.price,\n      submit_at: order.time,\n      updated_at: formatTime(order.updateTime),\n      order_status: mapBinanceOrderStatus(order.status),\n    }),\n  );\n};\n\nexport const listSpotOrders = async (credential: ICredential): Promise<IOrder[]> => {\n  const res = await getSpotOpenOrders(credential);\n  if (isApiError(res)) {\n    throw new Error(res.msg);\n  }\n  return res.map(\n    (order): IOrder => ({\n      order_id: `${order.orderId}`,\n      account_id: '',\n      product_id: encodePath('BINANCE', 'SPOT', order.symbol),\n      order_type: mapBinanceOrderTypeToYuants(order.type),\n      order_direction: mapSpotSideToOrderDirection(order.side),\n      volume: +order.origQty,\n      traded_volume: +order.executedQty,\n      price: order.price === undefined ? undefined : +order.price,\n      submit_at: order.time,\n      updated_at: formatTime(order.updateTime),\n      order_status: mapBinanceOrderStatus(order.status),\n    }),\n  );\n};\n\nexport const getOrdersByProductId = async function (\n  credential: ICredential,\n  product_id: string,\n): Promise<IOrder[]> {\n  const [_, instType] = decodePath(product_id); // BINANCE/USDT-FUTURE/ADAUSDT\n  if (instType === 'SPOT') {\n    const orders = await listSpotOrders(credential);\n    return orders.filter((order) => order.product_id === product_id);\n  }\n  if (instType === 'USDT-FUTURE') {\n    const orders = await listUnifiedUmOrders(credential);\n    return orders.filter((order) => order.product_id === product_id);\n  }\n  throw new Error(`Unsupported instType: ${instType}`);\n};\n"]}

package/lib/services/orders/modifyOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifyOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/modifyOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAA0C,MAAM,uBAAuB,CAAC;AA4D5F,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAQhE,CAAC"}
+{"version":3,"file":"modifyOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/modifyOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAA0C,MAAM,uBAAuB,CAAC;AA8D5F,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAWhE,CAAC"}

package/lib/services/orders/modifyOrder.js

@@ -4,6 +4,8 @@ exports.modifyOrder = void 0;
 const client_1 = require("../../api/client");
 const private_api_1 = require("../../api/private-api");
 const order_utils_1 = require("./order-utils");
+const error_1 = require("@yuants/utils/lib/error");
+const path_1 = require("@yuants/utils/lib/path");
 const modifyUnifiedOrder = async (credential, order) => {
     const symbol = (0, order_utils_1.decodeFutureSymbol)(order.product_id);
     const side = (0, order_utils_1.mapOrderDirectionToSide)(order.order_direction);
@@ -50,13 +52,14 @@ const modifySpotOrder = async (credential, order) => {
     }
 };
 const modifyOrder = async (credential, order) => {
-    if (order.account_id.includes('/unified/')) {
+    const [, TYPE] = (0, path_1.decodePath)(order.product_id);
+    if (TYPE === 'USDT-FUTURE') {
         return modifyUnifiedOrder(credential, order);
     }
-    if (order.account_id.includes('/spot/')) {
+    if (TYPE === 'SPOT') {
         return modifySpotOrder(credential, order);
     }
-    throw new Error(`Unsupported account_id for modifyOrder: ${order.account_id}`);
+    throw (0, error_1.newError)('BINANCE_MODIFY_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });
 };
 exports.modifyOrder = modifyOrder;
 //# sourceMappingURL=modifyOrder.js.map

package/lib/services/orders/modifyOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"modifyOrder.js","sourceRoot":"","sources":["../../../src/services/orders/modifyOrder.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfModifyOrder } from '@yuants/data-order';\nimport { isApiError } from '../../api/client';\nimport { ICredential, postSpotOrderCancelReplace, putUmOrder } from '../../api/private-api';\nimport {\n  decodeFutureSymbol,\n  decodeSpotSymbol,\n  deriveClientOrderId,\n  mapOrderDirectionToSide,\n  mapOrderTypeToOrdType,\n} from './order-utils';\n\nconst modifyUnifiedOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeFutureSymbol(order.product_id);\n  const side = mapOrderDirectionToSide(order.order_direction);\n\n  const res = await putUmOrder(credential, {\n    symbol,\n    side,\n    orderId: order.order_id ? parseInt(order.order_id) : undefined,\n    // origClientOrderId: order.client_order_id, // TODO: support client_order_id\n    quantity: order.volume,\n    price: order.price,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance modify unified order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nconst modifySpotOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeSpotSymbol(order.product_id);\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n\n  const params: Parameters<typeof postSpotOrderCancelReplace>[1] = {\n    symbol,\n    side,\n    type,\n    cancelReplaceMode: 'STOP_ON_FAILURE',\n    cancelOrderId: order.order_id ? parseInt(order.order_id) : undefined,\n    // cancelOrigClientOrderId: order.client_order_id, // TODO: support client_order_id\n    newClientOrderId: deriveClientOrderId(order),\n    quantity: order.volume,\n  };\n\n  if (type === 'LIMIT') {\n    if (order.price === undefined) {\n      throw new Error('Binance spot LIMIT order requires price');\n    }\n    params.price = order.price;\n    params.timeInForce = timeInForce;\n  }\n  if (order.price !== undefined && type === 'MARKET') {\n    params.price = order.price;\n  }\n\n  const res = await postSpotOrderCancelReplace(credential, params);\n  if (isApiError(res)) {\n    throw new Error(`Binance modify spot order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nexport const modifyOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  if (order.account_id.includes('/unified/')) {\n    return modifyUnifiedOrder(credential, order);\n  }\n  if (order.account_id.includes('/spot/')) {\n    return modifySpotOrder(credential, order);\n  }\n  throw new Error(`Unsupported account_id for modifyOrder: ${order.account_id}`);\n};\n"]}
+{"version":3,"file":"modifyOrder.js","sourceRoot":"","sources":["../../../src/services/orders/modifyOrder.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfModifyOrder } from '@yuants/data-order';\nimport { isApiError } from '../../api/client';\nimport { ICredential, postSpotOrderCancelReplace, putUmOrder } from '../../api/private-api';\nimport {\n  decodeFutureSymbol,\n  decodeSpotSymbol,\n  deriveClientOrderId,\n  mapOrderDirectionToSide,\n  mapOrderTypeToOrdType,\n} from './order-utils';\nimport { newError } from '@yuants/utils/lib/error';\nimport { decodePath } from '@yuants/utils/lib/path';\n\nconst modifyUnifiedOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeFutureSymbol(order.product_id);\n  const side = mapOrderDirectionToSide(order.order_direction);\n\n  const res = await putUmOrder(credential, {\n    symbol,\n    side,\n    orderId: order.order_id ? parseInt(order.order_id) : undefined,\n    // origClientOrderId: order.client_order_id, // TODO: support client_order_id\n    quantity: order.volume,\n    price: order.price,\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance modify unified order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nconst modifySpotOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeSpotSymbol(order.product_id);\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n\n  const params: Parameters<typeof postSpotOrderCancelReplace>[1] = {\n    symbol,\n    side,\n    type,\n    cancelReplaceMode: 'STOP_ON_FAILURE',\n    cancelOrderId: order.order_id ? parseInt(order.order_id) : undefined,\n    // cancelOrigClientOrderId: order.client_order_id, // TODO: support client_order_id\n    newClientOrderId: deriveClientOrderId(order),\n    quantity: order.volume,\n  };\n\n  if (type === 'LIMIT') {\n    if (order.price === undefined) {\n      throw new Error('Binance spot LIMIT order requires price');\n    }\n    params.price = order.price;\n    params.timeInForce = timeInForce;\n  }\n  if (order.price !== undefined && type === 'MARKET') {\n    params.price = order.price;\n  }\n\n  const res = await postSpotOrderCancelReplace(credential, params);\n  if (isApiError(res)) {\n    throw new Error(`Binance modify spot order failed: ${res.code} ${res.msg}`);\n  }\n};\n\nexport const modifyOrder: IActionHandlerOfModifyOrder<ICredential> = async (credential, order) => {\n  const [, TYPE] = decodePath(order.product_id);\n\n  if (TYPE === 'USDT-FUTURE') {\n    return modifyUnifiedOrder(credential, order);\n  }\n  if (TYPE === 'SPOT') {\n    return modifySpotOrder(credential, order);\n  }\n\n  throw newError('BINANCE_MODIFY_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });\n};\n"]}

package/lib/services/orders/order-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-utils.d.ts","sourceRoot":"","sources":["../../../src/services/orders/order-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI5C,eAAO,MAAM,kBAAkB,eAAgB,MAAM,WAMpD,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WAalD,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAgB,MAAM,CAAC,iBAAiB,CAAC,mBAW5E,CAAC;AAEF,eAAO,MAAM,+BAA+B,eAAgB,MAAM,CAAC,iBAAiB,CAAC,qBAWpF,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBAAiB,MAAM,CAAC,YAAY,CAAC,uBAUtE,CAAC;AAEF,eAAO,MAAM,2BAA2B,iBAAkB,MAAM,KAAG,MAAM,CAAC,YAAY,CASrF,CAAC;AAEF,eAAO,MAAM,+BAA+B,UACnC,MAAM,iBACE,MAAM,KACpB,MAAM,CAAC,iBAAiB,CAAC,GAAG,SAW9B,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAAW,MAAM,KAAG,MAAM,CAAC,iBAAiB,CAKnF,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAAW,MAAM,WAWhD,CAAC;AAcF,eAAO,MAAM,qBAAqB,YAAa,MAAM,KAAG,MAAM,CAAC,cAAc,CAG5E,CAAC"}
+{"version":3,"file":"order-utils.d.ts","sourceRoot":"","sources":["../../../src/services/orders/order-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI5C,eAAO,MAAM,kBAAkB,eAAgB,MAAM,WAiBpD,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WAsBlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAgB,MAAM,CAAC,iBAAiB,CAAC,mBAW5E,CAAC;AAEF,eAAO,MAAM,+BAA+B,eAAgB,MAAM,CAAC,iBAAiB,CAAC,qBAWpF,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBAAiB,MAAM,CAAC,YAAY,CAAC,uBAUtE,CAAC;AAEF,eAAO,MAAM,2BAA2B,iBAAkB,MAAM,KAAG,MAAM,CAAC,YAAY,CASrF,CAAC;AAEF,eAAO,MAAM,+BAA+B,UACnC,MAAM,iBACE,MAAM,KACpB,MAAM,CAAC,iBAAiB,CAAC,GAAG,SAW9B,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAAW,MAAM,KAAG,MAAM,CAAC,iBAAiB,CAKnF,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAAW,MAAM,WAWhD,CAAC;AAcF,eAAO,MAAM,qBAAqB,YAAa,MAAM,KAAG,MAAM,CAAC,cAAc,CAG5E,CAAC"}

package/lib/services/orders/order-utils.js

@@ -4,18 +4,40 @@ exports.mapBinanceOrderStatus = exports.deriveClientOrderId = exports.mapSpotSid
 const utils_1 = require("@yuants/utils");
 const crypto_1 = require("crypto");
 const decodeFutureSymbol = (product_id) => {
-    const [instType, symbol] = (0, utils_1.decodePath)(product_id);
-    if (instType !== 'usdt-future' || !symbol) {
-        throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);
+    const parts = (0, utils_1.decodePath)(product_id);
+    // Support both old format (usdt-future/symbol) and new format (BINANCE/USDT-FUTURE/symbol)
+    if (parts.length === 2) {
+        const [instType, symbol] = parts;
+        if (instType !== 'usdt-future' || !symbol) {
+            throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);
+        }
+        return symbol;
+    }
+    else if (parts.length === 3) {
+        const [datasource, instType, symbol] = parts;
+        if (datasource !== 'BINANCE' || instType !== 'USDT-FUTURE' || !symbol) {
+            throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);
+        }
+        return symbol;
     }
-    return symbol;
+    throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);
 };
 exports.decodeFutureSymbol = decodeFutureSymbol;
 const decodeSpotSymbol = (product_id) => {
     try {
-        const [instType, symbol] = (0, utils_1.decodePath)(product_id);
-        if ((instType === null || instType === void 0 ? void 0 : instType.toLowerCase()) === 'spot' && symbol) {
-            return symbol;
+        const parts = (0, utils_1.decodePath)(product_id);
+        // Support both old format (spot/symbol) and new format (BINANCE/SPOT/symbol)
+        if (parts.length === 2) {
+            const [instType, symbol] = parts;
+            if ((instType === null || instType === void 0 ? void 0 : instType.toLowerCase()) === 'spot' && symbol) {
+                return symbol;
+            }
+        }
+        else if (parts.length === 3) {
+            const [datasource, instType, symbol] = parts;
+            if (datasource === 'BINANCE' && instType === 'SPOT' && symbol) {
+                return symbol;
+            }
         }
     }
     catch (err) {

package/lib/services/orders/order-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-utils.js","sourceRoot":"","sources":["../../../src/services/orders/order-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { decodePath } from '@yuants/utils';\nimport { createHash } from 'crypto';\n\nexport const decodeFutureSymbol = (product_id: string) => {\n  const [instType, symbol] = decodePath(product_id);\n  if (instType !== 'usdt-future' || !symbol) {\n    throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);\n  }\n  return symbol;\n};\n\nexport const decodeSpotSymbol = (product_id: string) => {\n  try {\n    const [instType, symbol] = decodePath(product_id);\n    if (instType?.toLowerCase() === 'spot' && symbol) {\n      return symbol;\n    }\n  } catch (err) {\n    // ignore decode errors and fall back to raw product id\n  }\n  if (!product_id.includes('/')) {\n    return product_id;\n  }\n  throw new Error(`Unsupported product_id for Binance spot: ${product_id}`);\n};\n\nexport const mapOrderDirectionToSide = (direction?: IOrder['order_direction']) => {\n  switch (direction) {\n    case 'OPEN_LONG':\n    case 'CLOSE_SHORT':\n      return 'BUY';\n    case 'OPEN_SHORT':\n    case 'CLOSE_LONG':\n      return 'SELL';\n    default:\n      throw new Error(`Unsupported order_direction: ${direction}`);\n  }\n};\n\nexport const mapOrderDirectionToPositionSide = (direction?: IOrder['order_direction']) => {\n  switch (direction) {\n    case 'OPEN_LONG':\n    case 'CLOSE_LONG':\n      return 'LONG';\n    case 'OPEN_SHORT':\n    case 'CLOSE_SHORT':\n      return 'SHORT';\n    default:\n      throw new Error(`Unsupported order_direction for positionSide: ${direction}`);\n  }\n};\n\nexport const mapOrderTypeToOrdType = (order_type?: IOrder['order_type']) => {\n  switch (order_type) {\n    case 'LIMIT':\n    case 'MAKER':\n      return 'LIMIT';\n    case 'MARKET':\n      return 'MARKET';\n    default:\n      throw new Error(`Unsupported order_type: ${order_type}`);\n  }\n};\n\nexport const mapBinanceOrderTypeToYuants = (binanceType?: string): IOrder['order_type'] => {\n  switch (binanceType) {\n    case 'LIMIT':\n      return 'LIMIT';\n    case 'MARKET':\n      return 'MARKET';\n    default:\n      return 'LIMIT';\n  }\n};\n\nexport const mapBinanceSideToYuantsDirection = (\n  side?: string,\n  positionSide?: string,\n): IOrder['order_direction'] | undefined => {\n  if (!side || !positionSide) {\n    return undefined;\n  }\n  if (positionSide === 'LONG') {\n    return side === 'BUY' ? 'OPEN_LONG' : 'CLOSE_LONG';\n  }\n  if (positionSide === 'SHORT') {\n    return side === 'SELL' ? 'OPEN_SHORT' : 'CLOSE_SHORT';\n  }\n  return undefined;\n};\n\nexport const mapSpotSideToOrderDirection = (side?: string): IOrder['order_direction'] => {\n  if (side === 'SELL') {\n    return 'CLOSE_LONG';\n  }\n  return 'OPEN_LONG';\n};\n\nexport const deriveClientOrderId = (order: IOrder) => {\n  if (order.order_id) return `${order.order_id}`;\n  const payload = JSON.stringify({\n    account_id: order.account_id,\n    product_id: order.product_id,\n    order_direction: order.order_direction,\n    order_type: order.order_type,\n    price: order.price,\n    volume: order.volume,\n  });\n  return `YUANTS${createHash('sha256').update(payload).digest('hex').slice(0, 24)}`;\n};\n\nconst BinanceOrderStatusMap: Record<string, IOrder['order_status']> = {\n  NEW: 'ACCEPTED',\n  PARTIALLY_FILLED: 'TRADED',\n  FILLED: 'TRADED',\n  PENDING_NEW: 'ACCEPTED',\n  PENDING_CANCEL: 'CANCELLED',\n  CANCELED: 'CANCELLED',\n  CANCELLED: 'CANCELLED',\n  REJECTED: 'CANCELLED',\n  EXPIRED: 'CANCELLED',\n};\n\nexport const mapBinanceOrderStatus = (status?: string): IOrder['order_status'] => {\n  if (!status) return 'ACCEPTED';\n  return BinanceOrderStatusMap[status] ?? 'ACCEPTED';\n};\n"]}
+{"version":3,"file":"order-utils.js","sourceRoot":"","sources":["../../../src/services/orders/order-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { decodePath } from '@yuants/utils';\nimport { createHash } from 'crypto';\n\nexport const decodeFutureSymbol = (product_id: string) => {\n  const parts = decodePath(product_id);\n  // Support both old format (usdt-future/symbol) and new format (BINANCE/USDT-FUTURE/symbol)\n  if (parts.length === 2) {\n    const [instType, symbol] = parts;\n    if (instType !== 'usdt-future' || !symbol) {\n      throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);\n    }\n    return symbol;\n  } else if (parts.length === 3) {\n    const [datasource, instType, symbol] = parts;\n    if (datasource !== 'BINANCE' || instType !== 'USDT-FUTURE' || !symbol) {\n      throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);\n    }\n    return symbol;\n  }\n  throw new Error(`Unsupported product_id for Binance futures: ${product_id}`);\n};\n\nexport const decodeSpotSymbol = (product_id: string) => {\n  try {\n    const parts = decodePath(product_id);\n    // Support both old format (spot/symbol) and new format (BINANCE/SPOT/symbol)\n    if (parts.length === 2) {\n      const [instType, symbol] = parts;\n      if (instType?.toLowerCase() === 'spot' && symbol) {\n        return symbol;\n      }\n    } else if (parts.length === 3) {\n      const [datasource, instType, symbol] = parts;\n      if (datasource === 'BINANCE' && instType === 'SPOT' && symbol) {\n        return symbol;\n      }\n    }\n  } catch (err) {\n    // ignore decode errors and fall back to raw product id\n  }\n  if (!product_id.includes('/')) {\n    return product_id;\n  }\n  throw new Error(`Unsupported product_id for Binance spot: ${product_id}`);\n};\n\nexport const mapOrderDirectionToSide = (direction?: IOrder['order_direction']) => {\n  switch (direction) {\n    case 'OPEN_LONG':\n    case 'CLOSE_SHORT':\n      return 'BUY';\n    case 'OPEN_SHORT':\n    case 'CLOSE_LONG':\n      return 'SELL';\n    default:\n      throw new Error(`Unsupported order_direction: ${direction}`);\n  }\n};\n\nexport const mapOrderDirectionToPositionSide = (direction?: IOrder['order_direction']) => {\n  switch (direction) {\n    case 'OPEN_LONG':\n    case 'CLOSE_LONG':\n      return 'LONG';\n    case 'OPEN_SHORT':\n    case 'CLOSE_SHORT':\n      return 'SHORT';\n    default:\n      throw new Error(`Unsupported order_direction for positionSide: ${direction}`);\n  }\n};\n\nexport const mapOrderTypeToOrdType = (order_type?: IOrder['order_type']) => {\n  switch (order_type) {\n    case 'LIMIT':\n    case 'MAKER':\n      return 'LIMIT';\n    case 'MARKET':\n      return 'MARKET';\n    default:\n      throw new Error(`Unsupported order_type: ${order_type}`);\n  }\n};\n\nexport const mapBinanceOrderTypeToYuants = (binanceType?: string): IOrder['order_type'] => {\n  switch (binanceType) {\n    case 'LIMIT':\n      return 'LIMIT';\n    case 'MARKET':\n      return 'MARKET';\n    default:\n      return 'LIMIT';\n  }\n};\n\nexport const mapBinanceSideToYuantsDirection = (\n  side?: string,\n  positionSide?: string,\n): IOrder['order_direction'] | undefined => {\n  if (!side || !positionSide) {\n    return undefined;\n  }\n  if (positionSide === 'LONG') {\n    return side === 'BUY' ? 'OPEN_LONG' : 'CLOSE_LONG';\n  }\n  if (positionSide === 'SHORT') {\n    return side === 'SELL' ? 'OPEN_SHORT' : 'CLOSE_SHORT';\n  }\n  return undefined;\n};\n\nexport const mapSpotSideToOrderDirection = (side?: string): IOrder['order_direction'] => {\n  if (side === 'SELL') {\n    return 'CLOSE_LONG';\n  }\n  return 'OPEN_LONG';\n};\n\nexport const deriveClientOrderId = (order: IOrder) => {\n  if (order.order_id) return `${order.order_id}`;\n  const payload = JSON.stringify({\n    account_id: order.account_id,\n    product_id: order.product_id,\n    order_direction: order.order_direction,\n    order_type: order.order_type,\n    price: order.price,\n    volume: order.volume,\n  });\n  return `YUANTS${createHash('sha256').update(payload).digest('hex').slice(0, 24)}`;\n};\n\nconst BinanceOrderStatusMap: Record<string, IOrder['order_status']> = {\n  NEW: 'ACCEPTED',\n  PARTIALLY_FILLED: 'TRADED',\n  FILLED: 'TRADED',\n  PENDING_NEW: 'ACCEPTED',\n  PENDING_CANCEL: 'CANCELLED',\n  CANCELED: 'CANCELLED',\n  CANCELLED: 'CANCELLED',\n  REJECTED: 'CANCELLED',\n  EXPIRED: 'CANCELLED',\n};\n\nexport const mapBinanceOrderStatus = (status?: string): IOrder['order_status'] => {\n  if (!status) return 'ACCEPTED';\n  return BinanceOrderStatusMap[status] ?? 'ACCEPTED';\n};\n"]}

package/lib/services/orders/submitOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submitOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/submitOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAA8B,MAAM,uBAAuB,CAAC;AAuEhF,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAQhE,CAAC"}
+{"version":3,"file":"submitOrder.d.ts","sourceRoot":"","sources":["../../../src/services/orders/submitOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAAE,WAAW,EAA8B,MAAM,uBAAuB,CAAC;AAuEhF,eAAO,MAAM,WAAW,EAAE,2BAA2B,CAAC,WAAW,CAWhE,CAAC"}

package/lib/services/orders/submitOrder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.submitOrder = void 0;
+const utils_1 = require("@yuants/utils");
 const client_1 = require("../../api/client");
 const private_api_1 = require("../../api/private-api");
 const order_utils_1 = require("./order-utils");
@@ -62,13 +63,14 @@ const submitSpotOrder = async (credential, order) => {
     return { order_id: `${res.orderId}` };
 };
 const submitOrder = async (credential, order) => {
-    if (order.account_id.includes('/unified/')) {
+    const [, TYPE] = (0, utils_1.decodePath)(order.product_id);
+    if (TYPE === 'USDT-FUTURE') {
         return submitUnifiedOrder(credential, order);
     }
-    if (order.account_id.includes('/spot/')) {
+    if (TYPE === 'SPOT') {
         return submitSpotOrder(credential, order);
     }
-    throw new Error(`Unsupported account_id for submitOrder: ${order.account_id}`);
+    throw (0, utils_1.newError)('BINANCE_SUBMIT_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });
 };
 exports.submitOrder = submitOrder;
 //# sourceMappingURL=submitOrder.js.map

package/lib/services/orders/submitOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"submitOrder.js","sourceRoot":"","sources":["../../../src/services/orders/submitOrder.ts"],"names":[],"mappings":";;;AACA,6CAA8C;AAC9C,uDAAgF;AAChF,+CAOuB;AAEvB,MAAM,kBAAkB,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,MAAM,MAAM,GAAG,IAAA,gCAAkB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;KACxE;IACD,MAAM,IAAI,GAAG,IAAA,qCAAuB,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,IAAA,6CAA+B,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAG,IAAA,mCAAqB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5G,MAAM,UAAU,GACd,KAAK,CAAC,eAAe,KAAK,YAAY,IAAI,KAAK,CAAC,eAAe,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEzG,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE;QACxC,MAAM;QACN,IAAI;QACJ,YAAY;QACZ,IAAI;QACJ,QAAQ,EAAE,KAAK,CAAC,MAAM;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW;QACX,UAAU;QACV,gBAAgB,EAAE,IAAA,iCAAmB,EAAC,KAAK,CAAC;KAC7C,CAAC,CAAC;IACH,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAChF;IACD,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,eAAe,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC5F,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;KACxE;IACD,MAAM,IAAI,GAAG,IAAA,qCAAuB,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC5D,MAAM,IAAI,GAAG,IAAA,mCAAqB,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5G,MAAM,MAAM,GAAwC;QAClD,MAAM;QACN,IAAI;QACJ,IAAI;QACJ,QAAQ,EAAE,KAAK,CAAC,MAAM;QACtB,gBAAgB,EAAE,IAAA,iCAAmB,EAAC,KAAK,CAAC;KAC7C,CAAC;IACF,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;SAC5D;QACD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC3B,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;KAClC;IACD,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,KAAK,QAAQ,EAAE;QAClD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;KAC5B;IACD,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAa,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpD,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KAC7E;IACD,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;AACxC,CAAC,CAAC;AAEK,MAAM,WAAW,GAA6C,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC/F,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC1C,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC9C;IACD,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACvC,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KAC3C;IACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;AACjF,CAAC,CAAC;AARW,QAAA,WAAW,eAQtB","sourcesContent":["import { IActionHandlerOfSubmitOrder } from '@yuants/data-order';\nimport { isApiError } from '../../api/client';\nimport { ICredential, postSpotOrder, postUmOrder } from '../../api/private-api';\nimport {\n  decodeFutureSymbol,\n  decodeSpotSymbol,\n  deriveClientOrderId,\n  mapOrderDirectionToPositionSide,\n  mapOrderDirectionToSide,\n  mapOrderTypeToOrdType,\n} from './order-utils';\n\nconst submitUnifiedOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeFutureSymbol(order.product_id);\n  if (!order.volume) {\n    throw new Error('Binance submitOrder requires order.volume to be set');\n  }\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const positionSide = mapOrderDirectionToPositionSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n  const reduceOnly =\n    order.order_direction === 'CLOSE_LONG' || order.order_direction === 'CLOSE_SHORT' ? 'true' : undefined;\n\n  const res = await postUmOrder(credential, {\n    symbol,\n    side,\n    positionSide,\n    type,\n    quantity: order.volume,\n    price: order.price,\n    timeInForce,\n    reduceOnly,\n    newClientOrderId: deriveClientOrderId(order),\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance submit unified order failed: ${res.code} ${res.msg}`);\n  }\n  return { order_id: `${res.orderId}` };\n};\n\nconst submitSpotOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeSpotSymbol(order.product_id);\n  if (!order.volume) {\n    throw new Error('Binance submitOrder requires order.volume to be set');\n  }\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n  const params: Parameters<typeof postSpotOrder>[1] = {\n    symbol,\n    side,\n    type,\n    quantity: order.volume,\n    newClientOrderId: deriveClientOrderId(order),\n  };\n  if (type === 'LIMIT') {\n    if (order.price === undefined) {\n      throw new Error('Binance spot LIMIT order requires price');\n    }\n    params.price = order.price;\n    params.timeInForce = timeInForce;\n  }\n  if (order.price !== undefined && type === 'MARKET') {\n    params.price = order.price;\n  }\n  const res = await postSpotOrder(credential, params);\n  if (isApiError(res)) {\n    throw new Error(`Binance submit spot order failed: ${res.code} ${res.msg}`);\n  }\n  return { order_id: `${res.orderId}` };\n};\n\nexport const submitOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  if (order.account_id.includes('/unified/')) {\n    return submitUnifiedOrder(credential, order);\n  }\n  if (order.account_id.includes('/spot/')) {\n    return submitSpotOrder(credential, order);\n  }\n  throw new Error(`Unsupported account_id for submitOrder: ${order.account_id}`);\n};\n"]}
+{"version":3,"file":"submitOrder.js","sourceRoot":"","sources":["../../../src/services/orders/submitOrder.ts"],"names":[],"mappings":"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","sourcesContent":["import { IActionHandlerOfSubmitOrder } from '@yuants/data-order';\nimport { decodePath, newError } from '@yuants/utils';\nimport { isApiError } from '../../api/client';\nimport { ICredential, postSpotOrder, postUmOrder } from '../../api/private-api';\nimport {\n  decodeFutureSymbol,\n  decodeSpotSymbol,\n  deriveClientOrderId,\n  mapOrderDirectionToPositionSide,\n  mapOrderDirectionToSide,\n  mapOrderTypeToOrdType,\n} from './order-utils';\n\nconst submitUnifiedOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeFutureSymbol(order.product_id);\n  if (!order.volume) {\n    throw new Error('Binance submitOrder requires order.volume to be set');\n  }\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const positionSide = mapOrderDirectionToPositionSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n  const reduceOnly =\n    order.order_direction === 'CLOSE_LONG' || order.order_direction === 'CLOSE_SHORT' ? 'true' : undefined;\n\n  const res = await postUmOrder(credential, {\n    symbol,\n    side,\n    positionSide,\n    type,\n    quantity: order.volume,\n    price: order.price,\n    timeInForce,\n    reduceOnly,\n    newClientOrderId: deriveClientOrderId(order),\n  });\n  if (isApiError(res)) {\n    throw new Error(`Binance submit unified order failed: ${res.code} ${res.msg}`);\n  }\n  return { order_id: `${res.orderId}` };\n};\n\nconst submitSpotOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  const symbol = decodeSpotSymbol(order.product_id);\n  if (!order.volume) {\n    throw new Error('Binance submitOrder requires order.volume to be set');\n  }\n  const side = mapOrderDirectionToSide(order.order_direction);\n  const type = mapOrderTypeToOrdType(order.order_type);\n  const timeInForce = order.order_type === 'MAKER' ? 'GTX' : order.order_type === 'LIMIT' ? 'GTC' : undefined;\n  const params: Parameters<typeof postSpotOrder>[1] = {\n    symbol,\n    side,\n    type,\n    quantity: order.volume,\n    newClientOrderId: deriveClientOrderId(order),\n  };\n  if (type === 'LIMIT') {\n    if (order.price === undefined) {\n      throw new Error('Binance spot LIMIT order requires price');\n    }\n    params.price = order.price;\n    params.timeInForce = timeInForce;\n  }\n  if (order.price !== undefined && type === 'MARKET') {\n    params.price = order.price;\n  }\n  const res = await postSpotOrder(credential, params);\n  if (isApiError(res)) {\n    throw new Error(`Binance submit spot order failed: ${res.code} ${res.msg}`);\n  }\n  return { order_id: `${res.orderId}` };\n};\n\nexport const submitOrder: IActionHandlerOfSubmitOrder<ICredential> = async (credential, order) => {\n  const [, TYPE] = decodePath(order.product_id);\n\n  if (TYPE === 'USDT-FUTURE') {\n    return submitUnifiedOrder(credential, order);\n  }\n  if (TYPE === 'SPOT') {\n    return submitSpotOrder(credential, order);\n  }\n\n  throw newError('BINANCE_SUBMIT_ORDER_UNSUPPORTED_PRODUCT_TYPE', { order });\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yuants/vendor-binance",
-	"version": "0.8.7",
+	"version": "0.10.0",
 	"main": "lib/index.js",
 	"files": [
 		"dist",
@@ -20,6 +20,7 @@
 		"@yuants/data-order": "0.6.4",
 		"@yuants/data-interest-rate": "0.1.46",
 		"@yuants/transfer": "0.2.37",
+		"@yuants/exchange": "0.1.0",
 		"rxjs": "~7.5.6",
 		"crypto-js": "^4.2.0"
 	},