refactor

Author: peterszombati

src/core/Queue.ts

@@ -1,11 +1,14 @@
 import {AddTransaction, MessagesQueue, Transaction, Transactions} from '../interface/Interface'
 import {Listener} from '../modules/Listener'
-import {Time, Timer, Utils} from '..'
+import {Time, Timer} from '..'
 import {ConnectionStatus, errorCode, Listeners, TransactionStatus, TransactionType} from '../enum/Enum'
 import {WebSocketWrapper} from '../modules/WebSocketWrapper'
 import {JsonError} from 'logger4'
 import {XAPI} from './XAPI'
 import {transactionToJSONString} from '../utils/transactionToJSONString'
+import {formatNumber} from '../utils/formatNumber'
+import {getUTCTimestampString} from '../utils/getUTCTimestampString'
+import {hideSecretInfo} from '../utils/hideSecretInfo'
 
 export class Queue extends Listener {
   public transactions: Transactions = {}
@@ -66,7 +69,7 @@ export class Queue extends Listener {
     if (this._transactionIdIncrement > 9999) {
       this._transactionIdIncrement = 0
     }
-    return Utils.getUTCTimestampString() + Utils.formatNumber(this._transactionIdIncrement, 4) + (this.type === TransactionType.SOCKET ? '0' : '1')
+    return getUTCTimestampString() + formatNumber(this._transactionIdIncrement, 4) + (this.type === TransactionType.SOCKET ? '0' : '1')
   }
 
   public rejectOldTransactions(): void {
@@ -176,7 +179,7 @@ export class Queue extends Listener {
       transaction.transactionPromise = {resolve: null, reject: null}
       const error = new JsonError('Transaction Rejected', {
         reason: json,
-        transaction: transaction.command === 'login' ? Utils.hideSecretInfo(transaction) : transaction
+        transaction: transaction.command === 'login' ? hideSecretInfo(transaction) : transaction
       })
       error.stack = transaction.stack
       reject(error)

src/core/Socket/SocketConnection.ts

@@ -1,9 +1,10 @@
 import {TransactionResolveSocket} from '../../interface/Interface'
-import {Time, Timer, Utils} from '../..'
+import {Time, Timer} from '../..'
 import {WebSocketWrapper} from '../../modules/WebSocketWrapper'
 import {ConnectionStatus, errorCode, Listeners, TransactionStatus, TransactionType} from '../../enum/Enum'
 import {Queue} from '../Queue'
 import {XAPI} from '../XAPI'
+import {parseCustomTag} from '../../utils/parseCustomTag'
 
 export class SocketConnection extends Queue {
   private _password: string
@@ -169,7 +170,7 @@ export class SocketConnection extends Queue {
   }
 
   private handleError(code: any, explain: any, customTag: string | null, received: Time) {
-    const {transactionId} = Utils.parseCustomTag(customTag)
+    const {transactionId} = parseCustomTag(customTag)
 
     if (transactionId !== null && this.transactions[transactionId] !== undefined) {
       this.rejectTransaction({code, explain}, this.transactions[transactionId], false, received)
@@ -190,7 +191,7 @@ export class SocketConnection extends Queue {
       const customTag = typeof (message.customTag) === 'string'
         ? message.customTag
         : null
-      const {transactionId, command} = Utils.parseCustomTag(customTag)
+      const {transactionId, command} = parseCustomTag(customTag)
 
       if (transactionId !== null && command !== null && this.transactions[transactionId] !== undefined) {
         this.resolveTransaction(json, returnData, time, this.transactions[transactionId])

src/core/XAPI.ts

@@ -8,12 +8,13 @@ import {
   STREAMING_TRADE_RECORD,
   Time,
   TYPE_FIELD,
-  Utils
 } from '..'
 import {TradePosition, TradePositions, TradeStatus} from '../interface/Interface'
 import {CHART_RATE_LIMIT_BY_PERIOD, Currency2Pair, Listeners, PositionType, RelevantCurrencies} from '../enum/Enum'
 import {Socket} from './Socket/Socket'
 import {Stream} from './Stream/Stream'
+import {getObjectChanges} from '../utils/getObjectChanges'
+import {formatPosition} from '../utils/formatPosition'
 
 export const DefaultHostname = 'ws.xapi.pro'
 export const DefaultRateLimit = 850
@@ -154,7 +155,7 @@ export class XAPI extends Listener {
         data.forEach(t => {
           if (this._positions[t.position] === undefined || this._positions[t.position].value !== null) {
             obj[t.position] = {
-              value: Utils.formatPosition(t),
+              value: formatPosition(t),
               lastUpdated: sent
             }
           }
@@ -186,27 +187,27 @@ export class XAPI extends Listener {
         && t.cmd !== CMD_FIELD.SELL_LIMIT
         && t.cmd !== CMD_FIELD.BUY_STOP
         && t.cmd !== CMD_FIELD.SELL_STOP) {
-        this.callListener(Listeners.xapi_onPendingPosition, [Utils.formatPosition(t)])
+        this.callListener(Listeners.xapi_onPendingPosition, [formatPosition(t)])
       } else if (t.state === 'Deleted') {
         if (this._positions[t.position] !== undefined && this._positions[t.position].value !== null) {
           this._positions[t.position] = {value: null, lastUpdated: time}
-          this.callListener(Listeners.xapi_onDeletePosition, [Utils.formatPosition(t)])
+          this.callListener(Listeners.xapi_onDeletePosition, [formatPosition(t)])
         }
       } else if (this._positions[t.position] === undefined || this._positions[t.position].value !== null) {
         if (this._positions[t.position] !== undefined) {
           const {value} = this._positions[t.position]
 
           if (value) {
-            const changes = Utils.getObjectChanges(value, Utils.formatPosition(t))
+            const changes = getObjectChanges(value, formatPosition(t))
             if (Object.keys(changes).length > 0) {
-              this.callListener(Listeners.xapi_onChangePosition, [Utils.formatPosition(t)])
+              this.callListener(Listeners.xapi_onChangePosition, [formatPosition(t)])
             }
           }
         } else {
-          this.callListener(Listeners.xapi_onCreatePosition, [Utils.formatPosition(t)])
+          this.callListener(Listeners.xapi_onCreatePosition, [formatPosition(t)])
         }
 
-        this._positions[t.position] = {value: Utils.formatPosition(t), lastUpdated: time}
+        this._positions[t.position] = {value: formatPosition(t), lastUpdated: time}
       }
     })
 

src/index.ts

@@ -37,7 +37,6 @@ import {
   TYPE_FIELD,
 } from './enum/Enum'
 import {parseJsonLogin} from './modules/parseJsonLogin'
-import {Utils} from './utils/Utils'
 import {Time} from './modules/Time'
 import {TradePosition, TradeStatus} from './interface/Interface'
 import {Timer} from './modules/Timer'
@@ -85,7 +84,7 @@ export {
   errorCode,
 }
 
-export {parseJsonLogin, Utils, Time, TradePosition, Timer, TradeStatus, ListenerChild}
+export {parseJsonLogin, Time, TradePosition, Timer, TradeStatus, ListenerChild}
 
 export function getContractValue({price, lot, contractSize, currency, currencyProfit}:
   { price: number, lot: number, contractSize: number, currency: string, currencyProfit: string }) {

src/utils/Utils.ts

@@ -0,0 +1,6 @@
+export function formatNumber(number: number, length: number): string {
+  let result = number.toString()
+  return (length - result.length > 0)
+    ? '0'.repeat(length - result.length) + result
+    : result
+}

src/utils/formatNumber.ts

@@ -0,0 +1,28 @@
+import {STREAMING_TRADE_RECORD, TRADE_RECORD, TradePosition} from '..'
+import {getPositionType} from './getPositionType'
+
+export function formatPosition(t: STREAMING_TRADE_RECORD | TRADE_RECORD): TradePosition {
+  return {
+    close_time: t.close_time,
+    closed: t.closed,
+    cmd: t.cmd,
+    comment: t.comment,
+    commission: t.commission,
+    customComment: t.customComment,
+    digits: t.digits,
+    expiration: t.expiration,
+    margin_rate: t.margin_rate,
+    offset: t.offset,
+    open_price: t.open_price,
+    open_time: t.open_time,
+    order: t.order,
+    order2: t.order2,
+    position: t.position,
+    sl: t.sl,
+    storage: t.storage,
+    symbol: t.symbol,
+    tp: t.tp,
+    volume: t.volume,
+    position_type: getPositionType({cmd: t.cmd, closed: t.closed, close_time: t.close_time})
+  }
+}

src/utils/formatPosition.ts

@@ -0,0 +1,11 @@
+import {TradeRecord} from '../core/TradeRecord'
+
+export function getObjectChanges(from: TradeRecord, to: TradeRecord) {
+  const obj: any = {}
+  // @ts-ignore
+  Object.keys(from).filter(key => from[key] !== to[key]).forEach(key => {
+    // @ts-ignore
+    obj[key] = to[key]
+  })
+  return obj
+}

src/utils/getObjectChanges.ts

@@ -0,0 +1,17 @@
+import {CMD_FIELD, PositionType} from '../enum/Enum'
+
+export function getPositionType({
+  cmd,
+  closed,
+  close_time
+}: { cmd: CMD_FIELD, closed: boolean, close_time: number }): PositionType {
+  if (cmd === CMD_FIELD.SELL || cmd === CMD_FIELD.BUY) {
+    return close_time === null && !closed
+      ? PositionType.open
+      : PositionType.closed
+  } else {
+    return cmd === CMD_FIELD.BALANCE || cmd === CMD_FIELD.CREDIT
+      ? PositionType.source
+      : PositionType.limit
+  }
+}

src/utils/getPositionType.ts

@@ -0,0 +1,3 @@
+export function getUTCTimestampString(): string {
+  return new Date().getTime().toString()
+}