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
22 changes: 11 additions & 11 deletions src/modules/market.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Base } from './base';
import { fromatData } from '../util'
import { formatData } from '../util'

export class Market extends Base {
/**
Expand All @@ -22,7 +22,7 @@ export class Market extends Base {

const res = this.publicRequest("GET", "/exchangeInfo", options);
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -47,7 +47,7 @@ export class Market extends Base {
);

const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -72,7 +72,7 @@ export class Market extends Base {
);

const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -97,7 +97,7 @@ export class Market extends Base {
);

const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down Expand Up @@ -126,7 +126,7 @@ export class Market extends Base {
);

const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down Expand Up @@ -154,7 +154,7 @@ export class Market extends Base {
})
);
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -167,7 +167,7 @@ export class Market extends Base {
avgPrice(symbol: string) {
const res = this.publicRequest("GET", "/avgPrice", { symbol: symbol.toUpperCase() });
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -184,7 +184,7 @@ export class Market extends Base {

const res = this.publicRequest("GET", "/ticker/24hr", { symbol });
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -201,7 +201,7 @@ export class Market extends Base {

const res = this.publicRequest("GET", "/ticker/price", { symbol });
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -217,7 +217,7 @@ export class Market extends Base {

const res = this.publicRequest("GET", "/ticker/bookTicker", { symbol });
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down
16 changes: 8 additions & 8 deletions src/modules/trade.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UserData } from './userData';
import { fromatData } from '../util'
import { formatData } from '../util'

export class Trade extends UserData {
/**
Expand Down Expand Up @@ -39,7 +39,7 @@ export class Trade extends UserData {
type: orderType.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down Expand Up @@ -81,7 +81,7 @@ export class Trade extends UserData {
type: orderType.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -103,7 +103,7 @@ export class Trade extends UserData {
symbol: symbol.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -119,7 +119,7 @@ export class Trade extends UserData {
symbol: symbol.toUpperCase()
})
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -140,7 +140,7 @@ export class Trade extends UserData {
symbol: symbol.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -154,7 +154,7 @@ export class Trade extends UserData {
public openOrders(symbol: string) {
const res = this.signRequest('GET', '/openOrders', { symbol: symbol.toUpperCase()})
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -177,7 +177,7 @@ export class Trade extends UserData {
symbol: symbol.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down
6 changes: 3 additions & 3 deletions src/modules/userData.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Common } from './common';
import { fromatData } from '../util'
import { formatData } from '../util'

export class UserData extends Common {
/**
Expand All @@ -10,7 +10,7 @@ export class UserData extends Common {
public accountInfo() {
const res = this.signRequest ('GET', '/account')
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand All @@ -35,7 +35,7 @@ export class UserData extends Common {
symbol: symbol.toUpperCase()
}))
const rawData = JSON.parse(res.getBody());
const formatDatas = fromatData(rawData);
const formatDatas = formatData(rawData);

return formatDatas;
}
Expand Down
8 changes: 4 additions & 4 deletions src/util/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ const buildQueryString = (params: any) => {
.join('&')
}

const fromatData = (datas: any): any => {
const formatData = (datas: any): any => {
if(Array.isArray(datas)) {
return datas.map((data: any) => {
return fromatData(data)
return formatData(data)
})
} else if (typeof datas === "object" && datas !== null) {
const newObj: any = {}
Object.entries(datas).map(([key, value]: any[]) => newObj[key] = fromatData(value))
Object.entries(datas).map(([key, value]: any[]) => newObj[key] = formatData(value))
return newObj;
} else {
return (datas === undefined || datas === null) ? "" : datas
Expand All @@ -52,5 +52,5 @@ export {
buildQueryString,
removeEmptyValue,
isEmptyValue,
fromatData
formatData
}