Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stream.latestTradeDetail$.subscribe((v) => {})
* Trade Interface
- [ ] Trade order test
- [x] Trade order
- [ ] Bulk order
- [x] Bulk order
- [x] One-Click Close All Positions
- [ ] Cancel an Order
- [ ] Cancel a Batch of Orders
Expand Down
79 changes: 79 additions & 0 deletions src/bingx-client/services/trade.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import { AccountInterface } from 'bingx-api/bingx/account/account.interface';
import { EndpointInterface } from 'bingx-api/bingx/endpoints/endpoint.interface';
import { BingxBulkOrderEndpoint } from 'bingx-api/bingx/endpoints/bingx-bulk-order-endpoint';
import { OrderPositionSideEnum } from 'bingx-api/bingx/enums/order-position-side.enum';
import { OrderSideEnum } from 'bingx-api/bingx/enums/order-side.enum';
import { OrderTypeEnum } from 'bingx-api/bingx/enums/order-type.enum';
import { BingxCreateTradeOrderInterface } from 'bingx-api/bingx/interfaces/trade-order.interface';
import { RequestExecutorInterface } from 'bingx-api/bingx/request-executor/request-executor.interface';
import { TradeService } from 'bingx-api/bingx-client/services/trade.service';

class TestRequestExecutor implements RequestExecutorInterface {
public endpoint?: EndpointInterface;

execute<T>(endpoint: EndpointInterface<T>): Promise<T> {
this.endpoint = endpoint;
return Promise.resolve({} as T);
}
}

const account: AccountInterface = {
getApiKey: () => 'api-key',
sign: () => ({
toString: () => 'signature',
secretKey: () => 'secret-key',
}),
};

describe('TradeService', () => {
describe('bulkOrder', () => {
it('dispatches the bulk order endpoint', async () => {
const executor = new TestRequestExecutor();
const service = new TradeService(executor);
const orders: BingxCreateTradeOrderInterface[] = [
{
symbol: 'ETH-USDT',
type: OrderTypeEnum.MARKET,
side: OrderSideEnum.BUY,
positionSide: OrderPositionSideEnum.LONG,
quantity: '1',
},
{
symbol: 'BTC-USDT',
type: OrderTypeEnum.MARKET,
side: OrderSideEnum.BUY,
positionSide: OrderPositionSideEnum.LONG,
quantity: '0.001',
},
];

await service.bulkOrder(orders, account, 5000);

const endpoint = executor.endpoint as BingxBulkOrderEndpoint;
const parameters = endpoint.parameters().asRecord();

expect(endpoint).toBeInstanceOf(BingxBulkOrderEndpoint);
expect(endpoint.method()).toBe('post');
expect(endpoint.path()).toBe('/openApi/swap/v2/trade/batchOrders');
expect(JSON.parse(parameters.batchOrders)).toEqual(orders);
expect(parameters.recvWindow).toBe('5000');
expect(parameters.timestamp).toBeDefined();
});

it('omits recvWindow when it is not provided', async () => {
const endpoint = new BingxBulkOrderEndpoint(
[
{
symbol: 'ETH-USDT',
type: OrderTypeEnum.MARKET,
side: OrderSideEnum.BUY,
quantity: '1',
},
],
account,
);

expect(endpoint.parameters().asRecord().recvWindow).toBeUndefined();
});
});
});
11 changes: 11 additions & 0 deletions src/bingx-client/services/trade.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { BingxSwitchLeverageEndpoint } from 'bingx-api/bingx/endpoints/bingx-swi
import { OrderPositionSideEnum } from 'bingx-api/bingx';
import { BingxUserHistoryOrdersEndpoint } from 'bingx-api/bingx/endpoints/bingx-user-history-orders-endpoint';
import { BingxCancelOrderEndpoint } from 'bingx-api/bingx/endpoints/bingx-cancel-order-endpoint';
import { BingxBulkOrderEndpoint } from 'bingx-api/bingx/endpoints/bingx-bulk-order-endpoint';

export class TradeService {
constructor(private readonly requestExecutor: RequestExecutorInterface) {}
Expand All @@ -34,6 +35,16 @@ export class TradeService {
);
}

public async bulkOrder(
orders: BingxCreateTradeOrderInterface[],
account: AccountInterface,
recvWindow?: number,
) {
return this.requestExecutor.execute(
new BingxBulkOrderEndpoint(orders, account, recvWindow),
);
}

public async cancelOrder(
orderId: string,
symbol: string,
Expand Down
54 changes: 54 additions & 0 deletions src/bingx/endpoints/bingx-bulk-order-endpoint.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { AccountInterface } from 'bingx-api/bingx/account/account.interface';
import { DefaultSignatureParameters } from 'bingx-api/bingx/account/default-signature-parameters';
import { SignatureParametersInterface } from 'bingx-api/bingx/account/signature-parameters.interface';
import { BingxResponse } from 'bingx-api/bingx/interfaces/bingx-response';
import { BingxCreateTradeOrderInterface } from 'bingx-api/bingx/interfaces/trade-order.interface';
import { OrderPositionSideEnum } from 'bingx-api/bingx/enums/order-position-side.enum';
import { OrderSideEnum } from 'bingx-api/bingx/enums/order-side.enum';
import { OrderTypeEnum } from 'bingx-api/bingx/enums/order-type.enum';
import { Endpoint } from 'bingx-api/bingx/endpoints/endpoint';
import { EndpointInterface } from 'bingx-api/bingx/endpoints/endpoint.interface';

export interface BingxBulkOrderResponseInterface {
orders: Array<{
symbol: string;
side: OrderSideEnum;
type: OrderTypeEnum;
positionSide: OrderPositionSideEnum;
orderId: number;
clientOrderId: string;
workingType: string;
}>;
}

export class BingxBulkOrderEndpoint<R = BingxBulkOrderResponseInterface>
extends Endpoint
implements EndpointInterface<BingxResponse<R>>
{
constructor(
private readonly orders: BingxCreateTradeOrderInterface[],
account: AccountInterface,
private readonly recvWindow?: number,
) {
super(account);
}

readonly t!: BingxResponse<R>;

method(): 'get' | 'post' | 'put' | 'patch' | 'delete' {
return 'post';
}

parameters(): SignatureParametersInterface {
return new DefaultSignatureParameters({
batchOrders: JSON.stringify(this.orders),
...(this.recvWindow === undefined
? {}
: { recvWindow: this.recvWindow.toString(10) }),
});
}

path(): string {
return '/openApi/swap/v2/trade/batchOrders';
}
}
1 change: 1 addition & 0 deletions src/bingx/endpoints/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './bingx-cancel-all-orders-endpoint';
export * from './bingx-bulk-order-endpoint';
export * from './bingx-close-all-positions-endpoint';
export * from './bingx-generate-listen-key-endpoint';
export * from './bingx-generate-listen-key-response';
Expand Down
1 change: 0 additions & 1 deletion src/bingx/interfaces/websocket-event.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { OrderTypeEnum } from 'bingx-api/bingx/enums/order-type.enum';
import { OrderSideEnum } from 'bingx-api/bingx/enums/order-side.enum';
import { OrderStatusEnum } from 'bingx-api/bingx/enums/order-status.enum';
import { OrderPositionSideEnum } from 'bingx-api/bingx/enums/order-position-side.enum';
Expand Down