@yuants/vendor-okx 0.23.25 → 0.23.26

package/lib/accountInfos/trading.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trading.js","sourceRoot":"","sources":["../../src/accountInfos/trading.ts"],"names":[],"mappings":"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","sourcesContent":["import { IAccountMoney, 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';\nimport { productService } from '../product';\nimport { getMarketIndexTicker } from '../public-api';\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"]}

package/lib/accountInfos/types.d.ts

@@ -0,0 +1,6 @@
+import { IAccountMoney, IPosition } from '@yuants/data-account';
+export interface IAccountInfoCore {
+    money: Pick<IAccountMoney, 'currency' | 'equity' | 'free'>;
+    positions: IPosition[];
+}
+//# sourceMappingURL=types.d.ts.map

package/lib/accountInfos/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/accountInfos/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;IAC3D,SAAS,EAAE,SAAS,EAAE,CAAC;CACxB"}

package/lib/accountInfos/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/accountInfos/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/accountInfos/types.ts"],"names":[],"mappings":"","sourcesContent":["import { IAccountMoney, IPosition } from '@yuants/data-account';\n\nexport interface IAccountInfoCore {\n  money: Pick<IAccountMoney, 'currency' | 'equity' | 'free'>;\n  positions: IPosition[];\n}\n"]}

package/lib/loan-account.js

@@ -2,57 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const data_account_1 = require("@yuants/data-account");
 const protocol_1 = require("@yuants/protocol");
-const utils_1 = require("@yuants/utils");
 const rxjs_1 = require("rxjs");
 const account_1 = require("./account");
 const api_1 = require("./api");
+const accountInfos_1 = require("./accountInfos");
 (0, rxjs_1.defer)(async () => {
     const uid = await (0, rxjs_1.firstValueFrom)(account_1.accountUid$);
     const loanAccountId = `okx/${uid}/loan/USDT`;
     const credential = (0, api_1.getDefaultCredential)();
-    (0, data_account_1.provideAccountInfoService)(protocol_1.Terminal.fromNodeEnv(), loanAccountId, async () => {
-        const res = await (0, api_1.getFlexibleLoanInfo)(credential);
-        const data = res.data[0];
-        const positions = [];
-        for (const loan of data.loanData) {
-            positions.push({
-                datasource_id: 'OKX',
-                product_id: `SPOT/${loan.ccy}-USDT`,
-                volume: +loan.amt,
-                free_volume: +loan.amt,
-                position_id: (0, utils_1.encodePath)('loan', loan.ccy),
-                direction: 'SHORT',
-                position_price: 0,
-                closable_price: 0,
-                floating_profit: 0,
-                valuation: 0,
-            });
-        }
-        for (const collateral of data.collateralData) {
-            positions.push({
-                datasource_id: 'OKX',
-                product_id: `SPOT/${collateral.ccy}-USDT`,
-                volume: +collateral.amt,
-                free_volume: +collateral.amt,
-                position_id: (0, utils_1.encodePath)('collateral', collateral.ccy),
-                direction: 'LONG',
-                position_price: 0,
-                closable_price: 0,
-                floating_profit: 0,
-                valuation: 0,
-            });
-        }
-        const equity = +data.collateralNotionalUsd - +data.loanNotionalUsd;
-        const free = equity - +data.collateralNotionalUsd;
-        return {
-            money: {
-                currency: 'USDT',
-                equity,
-                free,
-            },
-            positions,
-        };
-    }, {
+    (0, data_account_1.provideAccountInfoService)(protocol_1.Terminal.fromNodeEnv(), loanAccountId, () => (0, accountInfos_1.getLoanAccountInfo)(credential), {
         auto_refresh_interval: 1000,
     });
 }).subscribe();

package/lib/loan-account.js.map

@@ -1 +1 @@
-{"version":3,"file":"loan-account.js","sourceRoot":"","sources":["../src/loan-account.ts"],"names":[],"mappings":";;AAAA,uDAA4E;AAC5E,+CAA4C;AAC5C,yCAA2C;AAC3C,+BAA6C;AAC7C,uCAAwC;AACxC,+BAAkE;AAElE,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAc,EAAC,qBAAW,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,OAAO,GAAG,YAAY,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,0BAAoB,GAAE,CAAC;IAE1C,IAAA,wCAAyB,EACvB,mBAAQ,CAAC,WAAW,EAAE,EACtB,aAAa,EACb,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAmB,EAAC,UAAU,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEzB,MAAM,SAAS,GAAgB,EAAE,CAAC;QAClC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAChC,SAAS,CAAC,IAAI,CAAC;gBACb,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,QAAQ,IAAI,CAAC,GAAG,OAAO;gBACnC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG;gBACjB,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG;gBACtB,WAAW,EAAE,IAAA,kBAAU,EAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC;gBACzC,SAAS,EAAE,OAAO;gBAClB,cAAc,EAAE,CAAC;gBACjB,cAAc,EAAE,CAAC;gBACjB,eAAe,EAAE,CAAC;gBAClB,SAAS,EAAE,CAAC;aACb,CAAC,CAAC;SACJ;QACD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE;YAC5C,SAAS,CAAC,IAAI,CAAC;gBACb,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,QAAQ,UAAU,CAAC,GAAG,OAAO;gBACzC,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG;gBACvB,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG;gBAC5B,WAAW,EAAE,IAAA,kBAAU,EAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC;gBACrD,SAAS,EAAE,MAAM;gBACjB,cAAc,EAAE,CAAC;gBACjB,cAAc,EAAE,CAAC;gBACjB,eAAe,EAAE,CAAC;gBAClB,SAAS,EAAE,CAAC;aACb,CAAC,CAAC;SACJ;QACD,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC;QACnE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC;QAClD,OAAO;YACL,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM;gBAChB,MAAM;gBACN,IAAI;aACL;YACD,SAAS;SACV,CAAC;IACJ,CAAC,EACD;QACE,qBAAqB,EAAE,IAAI;KAC5B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC","sourcesContent":["import { IPosition, provideAccountInfoService } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { encodePath } from '@yuants/utils';\nimport { defer, firstValueFrom } from 'rxjs';\nimport { accountUid$ } from './account';\nimport { getDefaultCredential, getFlexibleLoanInfo } from './api';\n\ndefer(async () => {\n  const uid = await firstValueFrom(accountUid$);\n  const loanAccountId = `okx/${uid}/loan/USDT`;\n  const credential = getDefaultCredential();\n\n  provideAccountInfoService(\n    Terminal.fromNodeEnv(),\n    loanAccountId,\n    async () => {\n      const res = await getFlexibleLoanInfo(credential);\n      const data = res.data[0];\n\n      const positions: IPosition[] = [];\n      for (const loan of data.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      for (const collateral of data.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      return {\n        money: {\n          currency: 'USDT',\n          equity,\n          free,\n        },\n        positions,\n      };\n    },\n    {\n      auto_refresh_interval: 1000,\n    },\n  );\n}).subscribe();\n"]}
+{"version":3,"file":"loan-account.js","sourceRoot":"","sources":["../src/loan-account.ts"],"names":[],"mappings":";;AAAA,uDAAiE;AACjE,+CAA4C;AAC5C,+BAA6C;AAC7C,uCAAwC;AACxC,+BAA6C;AAC7C,iDAAoD;AAEpD,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAc,EAAC,qBAAW,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,OAAO,GAAG,YAAY,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,0BAAoB,GAAE,CAAC;IAE1C,IAAA,wCAAyB,EAAC,mBAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAA,iCAAkB,EAAC,UAAU,CAAC,EAAE;QACrG,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC","sourcesContent":["import { provideAccountInfoService } from '@yuants/data-account';\nimport { Terminal } from '@yuants/protocol';\nimport { defer, firstValueFrom } from 'rxjs';\nimport { accountUid$ } from './account';\nimport { getDefaultCredential } from './api';\nimport { getLoanAccountInfo } from './accountInfos';\n\ndefer(async () => {\n  const uid = await firstValueFrom(accountUid$);\n  const loanAccountId = `okx/${uid}/loan/USDT`;\n  const credential = getDefaultCredential();\n\n  provideAccountInfoService(Terminal.fromNodeEnv(), loanAccountId, () => getLoanAccountInfo(credential), {\n    auto_refresh_interval: 1000,\n  });\n}).subscribe();\n"]}

package/lib/order-actions.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const protocol_1 = require("@yuants/protocol");
-const utils_1 = require("@yuants/utils");
 const rxjs_1 = require("rxjs");
 const account_1 = require("./account");
 const api_1 = require("./api");
-const product_1 = require("./product");
-const quote_1 = require("./quote");
+const cancelOrder_1 = require("./orders/cancelOrder");
+const modifyOrder_1 = require("./orders/modifyOrder");
+const submitOrder_1 = require("./orders/submitOrder");
 const terminal = protocol_1.Terminal.fromNodeEnv();
 const credential = (0, api_1.getDefaultCredential)();
 (0, rxjs_1.defer)(async () => {
@@ -17,115 +17,7 @@ const credential = (0, api_1.getDefaultCredential)();
             account_id: { const: tradingAccountId },
         },
     }, async (msg) => {
-        var _a, _b, _c;
-        console.info((0, utils_1.formatTime)(Date.now()), 'SubmitOrder', JSON.stringify(msg));
-        const order = msg.req;
-        const [instType, instId] = (0, utils_1.decodePath)(order.product_id);
-        const mapOrderDirectionToSide = (direction) => {
-            switch (direction) {
-                case 'OPEN_LONG':
-                case 'CLOSE_SHORT':
-                    return 'buy';
-                case 'OPEN_SHORT':
-                case 'CLOSE_LONG':
-                    return 'sell';
-            }
-            throw new Error(`Unknown direction: ${direction}`);
-        };
-        const mapOrderDirectionToPosSide = (direction) => {
-            switch (direction) {
-                case 'OPEN_LONG':
-                case 'CLOSE_LONG':
-                    return 'long';
-                case 'CLOSE_SHORT':
-                case 'OPEN_SHORT':
-                    return 'short';
-            }
-            throw new Error(`Unknown direction: ${direction}`);
-        };
-        const mapOrderTypeToOrdType = (order_type) => {
-            switch (order_type) {
-                case 'LIMIT':
-                    return 'limit';
-                case 'MARKET':
-                    return 'market';
-                case 'MAKER':
-                    return 'post_only';
-            }
-            throw new Error(`Unknown order type: ${order_type}`);
-        };
-        // 交易数量，表示要购买或者出售的数量。
-        // 当币币/币币杠杆以限价买入和卖出时，指交易货币数量。
-        // 当币币杠杆以市价买入时，指计价货币的数量。
-        // 当币币杠杆以市价卖出时，指交易货币的数量。
-        // 对于币币市价单，单位由 tgtCcy 决定
-        // 当交割、永续、期权买入和卖出时，指合约张数。
-        const mapOrderVolumeToSz = async (order) => {
-            if (instType === 'SWAP') {
-                return order.volume;
-            }
-            if (instType === 'MARGIN') {
-                if (order.order_type === 'LIMIT') {
-                    return order.volume;
-                }
-                if (order.order_type === 'MAKER') {
-                    return order.volume;
-                }
-                if (order.order_type === 'MARKET') {
-                    if (order.order_direction === 'OPEN_SHORT' || order.order_direction === 'CLOSE_LONG') {
-                        return order.volume;
-                    }
-                    //
-                    const price = await (0, rxjs_1.firstValueFrom)(quote_1.spotMarketTickers$.pipe((0, rxjs_1.map)((x) => mapOrderDirectionToPosSide(order.order_direction) === 'long'
-                        ? +x[instId].askPx
-                        : +x[instId].bidPx)));
-                    if (!price) {
-                        throw new Error(`invalid tick: ${price}`);
-                    }
-                    console.info((0, utils_1.formatTime)(Date.now()), 'SubmitOrder', 'price', price);
-                    const theProduct = await (0, rxjs_1.firstValueFrom)(product_1.productService.mapProductIdToProduct$.pipe((0, rxjs_1.map)((x) => x.get(order.product_id))));
-                    if (!theProduct) {
-                        throw new Error(`Unknown product: ${order.position_id}`);
-                    }
-                    return (0, utils_1.roundToStep)(order.volume * price, theProduct.volume_step);
-                }
-                return 0;
-            }
-            if (instType === 'SPOT') {
-                return order.volume;
-            }
-            throw new Error(`Unknown instType: ${instType}`);
-        };
-        const params = {
-            instId,
-            tdMode: instType === 'SPOT' ? 'cash' : 'cross',
-            side: mapOrderDirectionToSide(order.order_direction),
-            posSide: instType === 'MARGIN' || instType === 'SPOT'
-                ? 'net'
-                : mapOrderDirectionToPosSide(order.order_direction),
-            ordType: mapOrderTypeToOrdType(order.order_type),
-            sz: (await mapOrderVolumeToSz(order)).toString(),
-            tgtCcy: instType === 'SPOT' && order.order_type === 'MARKET' ? 'base_ccy' : undefined,
-            reduceOnly: instType === 'MARGIN' && ['CLOSE_LONG', 'CLOSE_SHORT'].includes((_a = order.order_direction) !== null && _a !== void 0 ? _a : '')
-                ? 'true'
-                : undefined,
-            px: order.order_type === 'LIMIT' || order.order_type === 'MAKER' ? order.price.toString() : undefined,
-            ccy: instType === 'MARGIN' ? 'USDT' : undefined,
-        };
-        console.info((0, utils_1.formatTime)(Date.now()), 'SubmitOrder', 'params', JSON.stringify(params));
-        const res = await (0, api_1.postTradeOrder)(credential, params);
-        if (res.code === '0' && ((_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.ordId)) {
-            return {
-                res: {
-                    code: 0,
-                    message: 'OK',
-                    data: {
-                        order_id: res.data[0].ordId,
-                    },
-                },
-            };
-        }
-        return { res: { code: +res.code, message: res.msg } };
+        return { res: { code: 0, message: 'OK', data: { order_id: await (0, submitOrder_1.submitOrder)(credential, msg.req) } } };
     });
     terminal.server.provideService('ModifyOrder', {
         required: ['account_id'],
@@ -133,63 +25,7 @@ const credential = (0, api_1.getDefaultCredential)();
             account_id: { const: tradingAccountId },
         },
     }, async (msg) => {
-        console.info((0, utils_1.formatTime)(Date.now()), 'ModifyOrder', JSON.stringify(msg));
-        const order = msg.req;
-        const [instType, instId] = (0, utils_1.decodePath)(order.product_id);
-        const params = {
-            instId,
-            ordId: order.order_id, // 使用现有订单ID
-        };
-        // 如果需要修改价格
-        if (order.price !== undefined) {
-            params.newPx = order.price.toString();
-        }
-        // 如果需要修改数量
-        if (order.volume !== undefined) {
-            // 处理数量修改，类似于 SubmitOrder 中的逻辑
-            if (instType === 'SWAP') {
-                params.newSz = order.volume.toString();
-            }
-            else if (instType === 'SPOT') {
-                params.newSz = order.volume.toString();
-            }
-            else if (instType === 'MARGIN') {
-                if (order.order_type === 'LIMIT') {
-                    params.newSz = order.volume.toString();
-                }
-                if (order.order_type === 'MAKER') {
-                    params.newSz = order.volume.toString();
-                }
-                if (order.order_type === 'MARKET') {
-                    // 对于市价单，可能需要根据当前价格计算新的数量
-                    const price = await (0, rxjs_1.firstValueFrom)(quote_1.spotMarketTickers$.pipe((0, rxjs_1.map)((x) => order.order_direction === 'OPEN_LONG' || order.order_direction === 'CLOSE_SHORT'
-                        ? +x[instId].askPx
-                        : +x[instId].bidPx)));
-                    if (!price) {
-                        throw new Error(`invalid tick: ${price}`);
-                    }
-                    console.info((0, utils_1.formatTime)(Date.now()), 'ModifyOrder', 'price', price);
-                    const theProduct = await (0, rxjs_1.firstValueFrom)(product_1.productService.mapProductIdToProduct$.pipe((0, rxjs_1.map)((x) => x.get(order.product_id))));
-                    if (!theProduct) {
-                        throw new Error(`Unknown product: ${order.position_id}`);
-                    }
-                    params.newSz = (0, utils_1.roundToStep)(order.volume * price, theProduct.volume_step).toString();
-                }
-            }
-            else {
-                throw new Error(`Unknown instType: ${instType}`);
-            }
-        }
-        console.info((0, utils_1.formatTime)(Date.now()), 'ModifyOrder', 'params', JSON.stringify(params));
-        const res = await (0, api_1.postTradeAmendOrder)(credential, params);
-        if (res.code !== '0') {
-            return {
-                res: {
-                    code: +res.code,
-                    message: res.msg,
-                },
-            };
-        }
+        await (0, modifyOrder_1.modifyOrder)(credential, msg.req);
         return { res: { code: 0, message: 'OK' } };
     });
     terminal.server.provideService('CancelOrder', {
@@ -197,17 +33,9 @@ const credential = (0, api_1.getDefaultCredential)();
         properties: {
             account_id: { const: tradingAccountId },
         },
-    }, (msg) => (0, rxjs_1.defer)(async () => {
-        const order = msg.req;
-        const [instType, instId] = (0, utils_1.decodePath)(order.product_id);
-        const res = await (0, api_1.postTradeCancelOrder)(credential, {
-            instId,
-            ordId: order.order_id,
-        });
-        if (res.code !== '0') {
-            return { res: { code: +res.code, message: res.msg } };
-        }
+    }, async (msg) => {
+        await (0, cancelOrder_1.cancelOrder)(credential, msg.req);
         return { res: { code: 0, message: 'OK' } };
-    }));
+    });
 }).subscribe();
 //# sourceMappingURL=order-actions.js.map

package/lib/order-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-actions.js","sourceRoot":"","sources":["../src/order-actions.ts"],"names":[],"mappings":"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","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { Terminal } from '@yuants/protocol';\nimport { decodePath, formatTime, roundToStep } from '@yuants/utils';\nimport { defer, firstValueFrom, map } from 'rxjs';\nimport { tradingAccountId$ } from './account';\nimport { getDefaultCredential, postTradeAmendOrder, postTradeCancelOrder, postTradeOrder } from './api';\nimport { productService } from './product';\nimport { spotMarketTickers$ } from './quote';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const tradingAccountId = await firstValueFrom(tradingAccountId$);\n  terminal.server.provideService<IOrder, { order_id?: string }>(\n    'SubmitOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    async (msg) => {\n      console.info(formatTime(Date.now()), 'SubmitOrder', JSON.stringify(msg));\n      const order = msg.req;\n      const [instType, instId] = decodePath(order.product_id);\n\n      const mapOrderDirectionToSide = (direction?: string) => {\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        }\n        throw new Error(`Unknown direction: ${direction}`);\n      };\n      const mapOrderDirectionToPosSide = (direction?: string) => {\n        switch (direction) {\n          case 'OPEN_LONG':\n          case 'CLOSE_LONG':\n            return 'long';\n          case 'CLOSE_SHORT':\n          case 'OPEN_SHORT':\n            return 'short';\n        }\n        throw new Error(`Unknown direction: ${direction}`);\n      };\n      const mapOrderTypeToOrdType = (order_type?: string) => {\n        switch (order_type) {\n          case 'LIMIT':\n            return 'limit';\n          case 'MARKET':\n            return 'market';\n          case 'MAKER':\n            return 'post_only';\n        }\n        throw new Error(`Unknown order type: ${order_type}`);\n      };\n\n      // 交易数量，表示要购买或者出售的数量。\n      // 当币币/币币杠杆以限价买入和卖出时，指交易货币数量。\n      // 当币币杠杆以市价买入时，指计价货币的数量。\n      // 当币币杠杆以市价卖出时，指交易货币的数量。\n      // 对于币币市价单，单位由 tgtCcy 决定\n      // 当交割、永续、期权买入和卖出时，指合约张数。\n      const mapOrderVolumeToSz = async (order: IOrder) => {\n        if (instType === 'SWAP') {\n          return order.volume;\n        }\n        if (instType === 'MARGIN') {\n          if (order.order_type === 'LIMIT') {\n            return order.volume;\n          }\n          if (order.order_type === 'MAKER') {\n            return order.volume;\n          }\n          if (order.order_type === 'MARKET') {\n            if (order.order_direction === 'OPEN_SHORT' || order.order_direction === 'CLOSE_LONG') {\n              return order.volume;\n            }\n            //\n            const price = await firstValueFrom(\n              spotMarketTickers$.pipe(\n                map((x) =>\n                  mapOrderDirectionToPosSide(order.order_direction) === 'long'\n                    ? +x[instId].askPx\n                    : +x[instId].bidPx,\n                ),\n              ),\n            );\n            if (!price) {\n              throw new Error(`invalid tick: ${price}`);\n            }\n            console.info(formatTime(Date.now()), 'SubmitOrder', 'price', price);\n            const theProduct = await firstValueFrom(\n              productService.mapProductIdToProduct$.pipe(map((x) => x.get(order.product_id))),\n            );\n            if (!theProduct) {\n              throw new Error(`Unknown product: ${order.position_id}`);\n            }\n            return roundToStep(order.volume * price, theProduct.volume_step!);\n          }\n\n          return 0;\n        }\n\n        if (instType === 'SPOT') {\n          return order.volume;\n        }\n\n        throw new Error(`Unknown instType: ${instType}`);\n      };\n\n      const params = {\n        instId,\n        tdMode: instType === 'SPOT' ? 'cash' : 'cross',\n        side: mapOrderDirectionToSide(order.order_direction),\n        posSide:\n          instType === 'MARGIN' || instType === 'SPOT'\n            ? 'net'\n            : mapOrderDirectionToPosSide(order.order_direction),\n        ordType: mapOrderTypeToOrdType(order.order_type),\n        sz: (await mapOrderVolumeToSz(order)).toString(),\n        tgtCcy: instType === 'SPOT' && order.order_type === 'MARKET' ? 'base_ccy' : undefined,\n        reduceOnly:\n          instType === 'MARGIN' && ['CLOSE_LONG', 'CLOSE_SHORT'].includes(order.order_direction ?? '')\n            ? 'true'\n            : undefined,\n        px:\n          order.order_type === 'LIMIT' || order.order_type === 'MAKER' ? order.price!.toString() : undefined,\n        ccy: instType === 'MARGIN' ? 'USDT' : undefined,\n      };\n      console.info(formatTime(Date.now()), 'SubmitOrder', 'params', JSON.stringify(params));\n      const res = await postTradeOrder(credential, params);\n      if (res.code === '0' && res.data?.[0]?.ordId) {\n        return {\n          res: {\n            code: 0,\n            message: 'OK',\n            data: {\n              order_id: res.data[0].ordId,\n            },\n          },\n        };\n      }\n      return { res: { code: +res.code, message: res.msg } };\n    },\n  );\n\n  terminal.server.provideService<IOrder>(\n    'ModifyOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    async (msg) => {\n      console.info(formatTime(Date.now()), 'ModifyOrder', JSON.stringify(msg));\n      const order = msg.req;\n      const [instType, instId] = decodePath(order.product_id);\n\n      const params: {\n        instId: string;\n        ordId: string;\n        newPx?: string;\n        newSz?: string;\n      } = {\n        instId,\n        ordId: order.order_id!, // 使用现有订单ID\n      };\n\n      // 如果需要修改价格\n      if (order.price !== undefined) {\n        params.newPx = order.price.toString();\n      }\n\n      // 如果需要修改数量\n      if (order.volume !== undefined) {\n        // 处理数量修改，类似于 SubmitOrder 中的逻辑\n        if (instType === 'SWAP') {\n          params.newSz = order.volume.toString();\n        } else if (instType === 'SPOT') {\n          params.newSz = order.volume.toString();\n        } else if (instType === 'MARGIN') {\n          if (order.order_type === 'LIMIT') {\n            params.newSz = order.volume.toString();\n          }\n          if (order.order_type === 'MAKER') {\n            params.newSz = order.volume.toString();\n          }\n          if (order.order_type === 'MARKET') {\n            // 对于市价单，可能需要根据当前价格计算新的数量\n            const price = await firstValueFrom(\n              spotMarketTickers$.pipe(\n                map((x) =>\n                  order.order_direction === 'OPEN_LONG' || order.order_direction === 'CLOSE_SHORT'\n                    ? +x[instId].askPx\n                    : +x[instId].bidPx,\n                ),\n              ),\n            );\n            if (!price) {\n              throw new Error(`invalid tick: ${price}`);\n            }\n            console.info(formatTime(Date.now()), 'ModifyOrder', 'price', price);\n            const theProduct = await firstValueFrom(\n              productService.mapProductIdToProduct$.pipe(map((x) => x.get(order.product_id))),\n            );\n            if (!theProduct) {\n              throw new Error(`Unknown product: ${order.position_id}`);\n            }\n            params.newSz = roundToStep(order.volume * price, theProduct.volume_step!).toString();\n          }\n        } else {\n          throw new Error(`Unknown instType: ${instType}`);\n        }\n      }\n\n      console.info(formatTime(Date.now()), 'ModifyOrder', 'params', JSON.stringify(params));\n\n      const res = await postTradeAmendOrder(credential, params);\n      if (res.code !== '0') {\n        return {\n          res: {\n            code: +res.code,\n            message: res.msg,\n          },\n        };\n      }\n\n      return { res: { code: 0, message: 'OK' } };\n    },\n  );\n\n  terminal.server.provideService<IOrder>(\n    'CancelOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    (msg) =>\n      defer(async () => {\n        const order = msg.req;\n        const [instType, instId] = decodePath(order.product_id);\n        const res = await postTradeCancelOrder(credential, {\n          instId,\n          ordId: order.order_id!,\n        });\n        if (res.code !== '0') {\n          return { res: { code: +res.code, message: res.msg } };\n        }\n        return { res: { code: 0, message: 'OK' } };\n      }),\n  );\n}).subscribe();\n"]}
+{"version":3,"file":"order-actions.js","sourceRoot":"","sources":["../src/order-actions.ts"],"names":[],"mappings":";;AACA,+CAA4C;AAC5C,+BAA6C;AAC7C,uCAA8C;AAC9C,+BAA6C;AAC7C,sDAAmD;AACnD,sDAAmD;AACnD,sDAAmD;AAEnD,MAAM,QAAQ,GAAG,mBAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,UAAU,GAAG,IAAA,0BAAoB,GAAE,CAAC;AAE1C,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;IACf,MAAM,gBAAgB,GAAG,MAAM,IAAA,qBAAc,EAAC,2BAAiB,CAAC,CAAC;IACjE,QAAQ,CAAC,MAAM,CAAC,cAAc,CAC5B,aAAa,EACb;QACE,QAAQ,EAAE,CAAC,YAAY,CAAC;QACxB,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE;SACxC;KACF,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC;IACzG,CAAC,CACF,CAAC;IAEF,QAAQ,CAAC,MAAM,CAAC,cAAc,CAC5B,aAAa,EACb;QACE,QAAQ,EAAE,CAAC,YAAY,CAAC;QACxB,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE;SACxC;KACF,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;IAC7C,CAAC,CACF,CAAC;IAEF,QAAQ,CAAC,MAAM,CAAC,cAAc,CAC5B,aAAa,EACb;QACE,QAAQ,EAAE,CAAC,YAAY,CAAC;QACxB,UAAU,EAAE;YACV,UAAU,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE;SACxC;KACF,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;IAC7C,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { Terminal } from '@yuants/protocol';\nimport { defer, firstValueFrom } from 'rxjs';\nimport { tradingAccountId$ } from './account';\nimport { getDefaultCredential } from './api';\nimport { cancelOrder } from './orders/cancelOrder';\nimport { modifyOrder } from './orders/modifyOrder';\nimport { submitOrder } from './orders/submitOrder';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst credential = getDefaultCredential();\n\ndefer(async () => {\n  const tradingAccountId = await firstValueFrom(tradingAccountId$);\n  terminal.server.provideService<IOrder, { order_id?: string }>(\n    'SubmitOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    async (msg) => {\n      return { res: { code: 0, message: 'OK', data: { order_id: await submitOrder(credential, msg.req) } } };\n    },\n  );\n\n  terminal.server.provideService<IOrder>(\n    'ModifyOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    async (msg) => {\n      await modifyOrder(credential, msg.req);\n      return { res: { code: 0, message: 'OK' } };\n    },\n  );\n\n  terminal.server.provideService<IOrder>(\n    'CancelOrder',\n    {\n      required: ['account_id'],\n      properties: {\n        account_id: { const: tradingAccountId },\n      },\n    },\n    async (msg) => {\n      await cancelOrder(credential, msg.req);\n      return { res: { code: 0, message: 'OK' } };\n    },\n  );\n}).subscribe();\n"]}

package/lib/orders/cancelOrder.d.ts

@@ -0,0 +1,4 @@
+import { IOrder } from '@yuants/data-order';
+import { ICredential } from '../api';
+export declare const cancelOrder: (credential: ICredential, order: IOrder) => Promise<void>;
+//# sourceMappingURL=cancelOrder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cancelOrder.d.ts","sourceRoot":"","sources":["../../src/orders/cancelOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAwB,MAAM,QAAQ,CAAC;AAE3D,eAAO,MAAM,WAAW,eAAsB,WAAW,SAAS,MAAM,kBASvE,CAAC"}

package/lib/orders/cancelOrder.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelOrder = void 0;
+const utils_1 = require("@yuants/utils");
+const api_1 = require("../api");
+const cancelOrder = async (credential, order) => {
+    const [, instId] = (0, utils_1.decodePath)(order.product_id);
+    const res = await (0, api_1.postTradeCancelOrder)(credential, {
+        instId,
+        ordId: order.order_id,
+    });
+    if (res.code !== '0') {
+        throw new Error(`Cancel order failed: code=${res.code} msg=${res.msg}`);
+    }
+};
+exports.cancelOrder = cancelOrder;
+//# sourceMappingURL=cancelOrder.js.map

package/lib/orders/cancelOrder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancelOrder.js","sourceRoot":"","sources":["../../src/orders/cancelOrder.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,gCAA2D;AAEpD,MAAM,WAAW,GAAG,KAAK,EAAE,UAAuB,EAAE,KAAa,EAAE,EAAE;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAoB,EAAC,UAAU,EAAE;QACjD,MAAM;QACN,KAAK,EAAE,KAAK,CAAC,QAAS;KACvB,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AATW,QAAA,WAAW,eAStB","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { decodePath } from '@yuants/utils';\nimport { ICredential, postTradeCancelOrder } from '../api';\n\nexport const cancelOrder = async (credential: ICredential, order: IOrder) => {\n  const [, instId] = decodePath(order.product_id);\n  const res = await postTradeCancelOrder(credential, {\n    instId,\n    ordId: order.order_id!,\n  });\n  if (res.code !== '0') {\n    throw new Error(`Cancel order failed: code=${res.code} msg=${res.msg}`);\n  }\n};\n"]}

package/lib/orders/modifyOrder.d.ts

@@ -0,0 +1,4 @@
+import { IOrder } from '@yuants/data-order';
+import { ICredential } from '../api';
+export declare const modifyOrder: (credential: ICredential, order: IOrder) => Promise<void>;
+//# sourceMappingURL=modifyOrder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modifyOrder.d.ts","sourceRoot":"","sources":["../../src/orders/modifyOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAuB,MAAM,QAAQ,CAAC;AAI1D,eAAO,MAAM,WAAW,eAAsB,WAAW,SAAS,MAAM,kBAiEvE,CAAC"}

package/lib/orders/modifyOrder.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyOrder = void 0;
+const utils_1 = require("@yuants/utils");
+const rxjs_1 = require("rxjs");
+const api_1 = require("../api");
+const product_1 = require("../product");
+const quote_1 = require("../quote");
+const modifyOrder = async (credential, order) => {
+    const [instType, instId] = (0, utils_1.decodePath)(order.product_id);
+    const params = {
+        instId,
+        ordId: order.order_id, // 使用现有订单ID
+    };
+    // 如果需要修改价格
+    if (order.price !== undefined) {
+        params.newPx = order.price.toString();
+    }
+    // 如果需要修改数量
+    if (order.volume !== undefined) {
+        // 处理数量修改，类似于 SubmitOrder 中的逻辑
+        if (instType === 'SWAP') {
+            params.newSz = order.volume.toString();
+        }
+        else if (instType === 'SPOT') {
+            params.newSz = order.volume.toString();
+        }
+        else if (instType === 'MARGIN') {
+            if (order.order_type === 'LIMIT') {
+                params.newSz = order.volume.toString();
+            }
+            if (order.order_type === 'MAKER') {
+                params.newSz = order.volume.toString();
+            }
+            if (order.order_type === 'MARKET') {
+                // 对于市价单，可能需要根据当前价格计算新的数量
+                const price = await (0, rxjs_1.firstValueFrom)(quote_1.spotMarketTickers$.pipe((0, rxjs_1.map)((x) => order.order_direction === 'OPEN_LONG' || order.order_direction === 'CLOSE_SHORT'
+                    ? +x[instId].askPx
+                    : +x[instId].bidPx)));
+                if (!price) {
+                    throw new Error(`invalid tick: ${price}`);
+                }
+                console.info((0, utils_1.formatTime)(Date.now()), 'ModifyOrder', 'price', price);
+                const theProduct = await (0, rxjs_1.firstValueFrom)(product_1.productService.mapProductIdToProduct$.pipe((0, rxjs_1.map)((x) => x.get(order.product_id))));
+                if (!theProduct) {
+                    throw new Error(`Unknown product: ${order.position_id}`);
+                }
+                params.newSz = (0, utils_1.roundToStep)(order.volume * price, theProduct.volume_step).toString();
+            }
+        }
+        else {
+            throw new Error(`Unknown instType: ${instType}`);
+        }
+    }
+    console.info((0, utils_1.formatTime)(Date.now()), 'ModifyOrder', 'params', JSON.stringify(params));
+    const res = await (0, api_1.postTradeAmendOrder)(credential, params);
+    if (res.code !== '0') {
+        throw new Error(`ModifyOrder failed: code=${res.code}, msg=${res.msg}`);
+    }
+};
+exports.modifyOrder = modifyOrder;
+//# sourceMappingURL=modifyOrder.js.map

package/lib/orders/modifyOrder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modifyOrder.js","sourceRoot":"","sources":["../../src/orders/modifyOrder.ts"],"names":[],"mappings":";;;AACA,yCAAoE;AACpE,+BAA2C;AAC3C,gCAA0D;AAC1D,wCAA4C;AAC5C,oCAA8C;AAEvC,MAAM,WAAW,GAAG,KAAK,EAAE,UAAuB,EAAE,KAAa,EAAE,EAAE;IAC1E,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAKR;QACF,MAAM;QACN,KAAK,EAAE,KAAK,CAAC,QAAS,EAAE,WAAW;KACpC,CAAC;IAEF,WAAW;IACX,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;QAC7B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;KACvC;IAED,WAAW;IACX,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;QAC9B,8BAA8B;QAC9B,IAAI,QAAQ,KAAK,MAAM,EAAE;YACvB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;SACxC;aAAM,IAAI,QAAQ,KAAK,MAAM,EAAE;YAC9B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;SACxC;aAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE;YAChC,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aACxC;YACD,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aACxC;YACD,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE;gBACjC,yBAAyB;gBACzB,MAAM,KAAK,GAAG,MAAM,IAAA,qBAAc,EAChC,0BAAkB,CAAC,IAAI,CACrB,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CACR,KAAK,CAAC,eAAe,KAAK,WAAW,IAAI,KAAK,CAAC,eAAe,KAAK,aAAa;oBAC9E,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK;oBAClB,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CACrB,CACF,CACF,CAAC;gBACF,IAAI,CAAC,KAAK,EAAE;oBACV,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC;iBAC3C;gBACD,OAAO,CAAC,IAAI,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpE,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAc,EACrC,wBAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAChF,CAAC;gBACF,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;iBAC1D;gBACD,MAAM,CAAC,KAAK,GAAG,IAAA,mBAAW,EAAC,KAAK,CAAC,MAAM,GAAG,KAAK,EAAE,UAAU,CAAC,WAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;aACtF;SACF;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;SAClD;KACF;IAED,OAAO,CAAC,IAAI,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtF,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAmB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AAjEW,QAAA,WAAW,eAiEtB","sourcesContent":["import { IOrder } from '@yuants/data-order';\nimport { formatTime, decodePath, roundToStep } from '@yuants/utils';\nimport { firstValueFrom, map } from 'rxjs';\nimport { ICredential, postTradeAmendOrder } from '../api';\nimport { productService } from '../product';\nimport { spotMarketTickers$ } from '../quote';\n\nexport const modifyOrder = async (credential: ICredential, order: IOrder) => {\n  const [instType, instId] = decodePath(order.product_id);\n  const params: {\n    instId: string;\n    ordId: string;\n    newPx?: string;\n    newSz?: string;\n  } = {\n    instId,\n    ordId: order.order_id!, // 使用现有订单ID\n  };\n\n  // 如果需要修改价格\n  if (order.price !== undefined) {\n    params.newPx = order.price.toString();\n  }\n\n  // 如果需要修改数量\n  if (order.volume !== undefined) {\n    // 处理数量修改，类似于 SubmitOrder 中的逻辑\n    if (instType === 'SWAP') {\n      params.newSz = order.volume.toString();\n    } else if (instType === 'SPOT') {\n      params.newSz = order.volume.toString();\n    } else if (instType === 'MARGIN') {\n      if (order.order_type === 'LIMIT') {\n        params.newSz = order.volume.toString();\n      }\n      if (order.order_type === 'MAKER') {\n        params.newSz = order.volume.toString();\n      }\n      if (order.order_type === 'MARKET') {\n        // 对于市价单，可能需要根据当前价格计算新的数量\n        const price = await firstValueFrom(\n          spotMarketTickers$.pipe(\n            map((x) =>\n              order.order_direction === 'OPEN_LONG' || order.order_direction === 'CLOSE_SHORT'\n                ? +x[instId].askPx\n                : +x[instId].bidPx,\n            ),\n          ),\n        );\n        if (!price) {\n          throw new Error(`invalid tick: ${price}`);\n        }\n        console.info(formatTime(Date.now()), 'ModifyOrder', 'price', price);\n        const theProduct = await firstValueFrom(\n          productService.mapProductIdToProduct$.pipe(map((x) => x.get(order.product_id))),\n        );\n        if (!theProduct) {\n          throw new Error(`Unknown product: ${order.position_id}`);\n        }\n        params.newSz = roundToStep(order.volume * price, theProduct.volume_step!).toString();\n      }\n    } else {\n      throw new Error(`Unknown instType: ${instType}`);\n    }\n  }\n\n  console.info(formatTime(Date.now()), 'ModifyOrder', 'params', JSON.stringify(params));\n\n  const res = await postTradeAmendOrder(credential, params);\n  if (res.code !== '0') {\n    throw new Error(`ModifyOrder failed: code=${res.code}, msg=${res.msg}`);\n  }\n};\n"]}

package/lib/orders/submitOrder.d.ts

@@ -0,0 +1,4 @@
+import { IOrder } from '@yuants/data-order';
+import { ICredential } from '../api';
+export declare const submitOrder: (credential: ICredential, order: IOrder) => Promise<string>;
+//# sourceMappingURL=submitOrder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"submitOrder.d.ts","sourceRoot":"","sources":["../../src/orders/submitOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAkB,MAAM,QAAQ,CAAC;AAwCrD,eAAO,MAAM,WAAW,eAAsB,WAAW,SAAS,MAAM,KAAG,QAAQ,MAAM,CAiFxF,CAAC"}

package/lib/orders/submitOrder.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.submitOrder = void 0;
+const utils_1 = require("@yuants/utils");
+const rxjs_1 = require("rxjs");
+const api_1 = require("../api");
+const product_1 = require("../product");
+const quote_1 = require("../quote");
+const mapOrderDirectionToSide = (direction) => {
+    switch (direction) {
+        case 'OPEN_LONG':
+        case 'CLOSE_SHORT':
+            return 'buy';
+        case 'OPEN_SHORT':
+        case 'CLOSE_LONG':
+            return 'sell';
+    }
+    throw new Error(`Unknown direction: ${direction}`);
+};
+const mapOrderDirectionToPosSide = (direction) => {
+    switch (direction) {
+        case 'OPEN_LONG':
+        case 'CLOSE_LONG':
+            return 'long';
+        case 'CLOSE_SHORT':
+        case 'OPEN_SHORT':
+            return 'short';
+    }
+    throw new Error(`Unknown direction: ${direction}`);
+};
+const mapOrderTypeToOrdType = (order_type) => {
+    switch (order_type) {
+        case 'LIMIT':
+            return 'limit';
+        case 'MARKET':
+            return 'market';
+        case 'MAKER':
+            return 'post_only';
+    }
+    throw new Error(`Unknown order type: ${order_type}`);
+};
+const submitOrder = async (credential, order) => {
+    var _a, _b, _c;
+    const [instType, instId] = (0, utils_1.decodePath)(order.product_id);
+    // 交易数量，表示要购买或者出售的数量。
+    // 当币币/币币杠杆以限价买入和卖出时，指交易货币数量。
+    // 当币币杠杆以市价买入时，指计价货币的数量。
+    // 当币币杠杆以市价卖出时，指交易货币的数量。
+    // 对于币币市价单，单位由 tgtCcy 决定
+    // 当交割、永续、期权买入和卖出时，指合约张数。
+    const mapOrderVolumeToSz = async (order) => {
+        if (instType === 'SWAP') {
+            return order.volume;
+        }
+        if (instType === 'MARGIN') {
+            if (order.order_type === 'LIMIT') {
+                return order.volume;
+            }
+            if (order.order_type === 'MAKER') {
+                return order.volume;
+            }
+            if (order.order_type === 'MARKET') {
+                if (order.order_direction === 'OPEN_SHORT' || order.order_direction === 'CLOSE_LONG') {
+                    return order.volume;
+                }
+                //
+                const price = await (0, rxjs_1.firstValueFrom)(quote_1.spotMarketTickers$.pipe((0, rxjs_1.map)((x) => mapOrderDirectionToPosSide(order.order_direction) === 'long'
+                    ? +x[instId].askPx
+                    : +x[instId].bidPx)));
+                if (!price) {
+                    throw new Error(`invalid tick: ${price}`);
+                }
+                console.info((0, utils_1.formatTime)(Date.now()), 'SubmitOrder', 'price', price);
+                const theProduct = await (0, rxjs_1.firstValueFrom)(product_1.productService.mapProductIdToProduct$.pipe((0, rxjs_1.map)((x) => x.get(order.product_id))));
+                if (!theProduct) {
+                    throw new Error(`Unknown product: ${order.position_id}`);
+                }
+                return (0, utils_1.roundToStep)(order.volume * price, theProduct.volume_step);
+            }
+            return 0;
+        }
+        if (instType === 'SPOT') {
+            return order.volume;
+        }
+        throw new Error(`Unknown instType: ${instType}`);
+    };
+    const params = {
+        instId,
+        tdMode: instType === 'SPOT' ? 'cash' : 'cross',
+        side: mapOrderDirectionToSide(order.order_direction),
+        posSide: instType === 'MARGIN' || instType === 'SPOT'
+            ? 'net'
+            : mapOrderDirectionToPosSide(order.order_direction),
+        ordType: mapOrderTypeToOrdType(order.order_type),
+        sz: (await mapOrderVolumeToSz(order)).toString(),
+        tgtCcy: instType === 'SPOT' && order.order_type === 'MARKET' ? 'base_ccy' : undefined,
+        reduceOnly: instType === 'MARGIN' && ['CLOSE_LONG', 'CLOSE_SHORT'].includes((_a = order.order_direction) !== null && _a !== void 0 ? _a : '')
+            ? 'true'
+            : undefined,
+        px: order.order_type === 'LIMIT' || order.order_type === 'MAKER' ? order.price.toString() : undefined,
+        ccy: instType === 'MARGIN' ? 'USDT' : undefined,
+    };
+    console.info((0, utils_1.formatTime)(Date.now()), 'SubmitOrder', 'params', JSON.stringify(params));
+    const res = await (0, api_1.postTradeOrder)(credential, params);
+    if (res.code === '0' && ((_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.ordId)) {
+        return res.data[0].ordId;
+    }
+    throw `Failed to submit order: ${res.code} ${res.msg}`;
+};
+exports.submitOrder = submitOrder;
+//# sourceMappingURL=submitOrder.js.map