Skip to content

Adding options paramter for cancel spot order #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elihaidv wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adding options paramter for cancel spot order #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17f615f
Update node-binance-api.js
elihaidv Apr 6, 2022
f6119e7
Update node-binance-api.js
elihaidv Apr 6, 2022
9e1c33b
Merge branch 'jaggedsoft:master' into master
elihaidv May 4, 2023
3edf465
Add error catch when subscribe to `userFutureData`
elihaidv May 4, 2023
5b883e3
Add error callback type
elihaidv May 4, 2023
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 node-binance-api.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ declare module "node-binance-api" {
* @param {function} order_update_callback
* @param {Function} subscribed_callback - subscription callback
*/
userFutureData(margin_call_callback: _callback, account_update_callback: _callback, order_update_callback: _callback, subscribed_callback: _callback): any;
userFutureData(margin_call_callback: _callback, account_update_callback: _callback, order_update_callback: _callback, subscribed_callback: _callback, error_callback:_callback): any;
userFutureData(...args: any): any;

/**
Expand Down
19 changes: 15 additions & 4 deletions node-binance-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2990,10 +2990,15 @@ let api = function Binance( options = {} ) {
* Cancels an order
* @param {string} symbol - the symbol to cancel
* @param {string} orderid - the orderid to cancel
* @param {object} options - options for the request
* @param {function} callback - the callback function
* @return {promise or undefined} - omitting the callback returns a promise
*/
cancel: function ( symbol, orderid, callback = false ) {
cancel: function ( symbol, orderid, options, callback = false ) {
if (typeof options === 'function') { // Accept callback as third parameter
callback = options;
options = {}
}
if ( !callback ) {
return new Promise( ( resolve, reject ) => {
callback = ( error, response ) => {
Expand All @@ -3003,12 +3008,17 @@ let api = function Binance( options = {} ) {
resolve( response );
}
}
signedRequest( base + 'v3/order', { symbol: symbol, orderId: orderid }, function ( error, data ) {
options.symbol = symbol
options.orderId = orderid
signedRequest( base + 'v3/order', options, function ( error, data ) {
return callback.call( this, error, data, symbol );
}, 'DELETE' );
} )
} else {
signedRequest( base + 'v3/order', { symbol: symbol, orderId: orderid }, function ( error, data ) {

options.symbol = symbol
options.orderId = orderid
signedRequest( base + 'v3/order', options, function ( error, data ) {
return callback.call( this, error, data, symbol );
}, 'DELETE' );
}
Expand Down Expand Up @@ -5393,14 +5403,15 @@ let api = function Binance( options = {} ) {
* @param {function} order_update_callback
* @param {Function} subscribed_callback - subscription callback
*/
userFutureData: function userFutureData( margin_call_callback, account_update_callback = undefined, order_update_callback = undefined, subscribed_callback = undefined, account_config_update_callback = undefined ) {
userFutureData: function userFutureData( margin_call_callback, account_update_callback = undefined, order_update_callback = undefined, subscribed_callback = undefined, account_config_update_callback = undefined, error_callback = undefined ) {
const url = ( Binance.options.test ) ? fapiTest : fapi;

let reconnect = () => {
if ( Binance.options.reconnect ) userFutureData( margin_call_callback, account_update_callback, order_update_callback, subscribed_callback )
}

apiRequest( url + 'v1/listenKey', {}, function ( error, response ) {
if (error) return error_callback && error_callback(error.body);
Binance.options.listenFutureKey = response.listenKey;
setTimeout( function userDataKeepAlive() { // keepalive
try {
Expand Down