changes after merge peterszombati#26

peterszombati · peterszombati · commit 18dea83a4e8b · 2022-10-15T09:41:51.000+02:00
diff --git a/package.json b/package.json
@@ -13,31 +13,31 @@
     "build/*"
   ],
   "dependencies": {
-    "logger4": "^2.1.5",
-    "ws": "^8.9.0"
+    "logger4": "2.1.5",
+    "ws": "8.9.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.7.23",
-    "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
-    "chai": "^4.3.6",
-    "esbuild": "^0.15.10",
-    "eslint": "^8.24.0",
-    "mocha": "^10.0.0",
-    "prettier": "^2.7.1",
-    "ts-mocha": "^10.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "@types/chai": "4.3.3",
+    "@types/mocha": "10.0.0",
+    "@types/node": "18.7.23",
+    "@types/ws": "8.5.3",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
+    "@typescript-eslint/parser": "5.38.1",
+    "chai": "4.3.6",
+    "esbuild": "0.15.10",
+    "eslint": "8.24.0",
+    "mocha": "10.0.0",
+    "prettier": "2.7.1",
+    "ts-mocha": "10.0.0",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.4"
   },
   "scripts": {
     "build": "rm -rf ./build && tsc  --declaration --emitDeclarationOnly & node ./esbuild.config.js",
     "test": "ts-mocha -p ./tsconfig.json ./sandbox/tests.ts ./sandbox/sandbox.ts --exit",
     "prettier": "prettier --check \"src/**/*.ts\" \"sandbox/**/*.ts\"",
     "eslint": "eslint --fix \"src/**/*.ts\" \"sandbox/**/*.ts\"",
-    "lint": "tsc --noEmit && pnpm run prettier && pnpm run eslint"
+    "lint": "tsc --noEmit && npm run prettier && npm run eslint"
   },
   "repository": {
     "type": "git",
@@ -58,48 +58,4 @@
     "url": "https://github.com/peterszombati/xapi-node/issues"
   },
   "homepage": "https://github.com/peterszombati/xapi-node#readme"
-=======
-	"name": "xapi-node",
-	"version": "2.5.6",
-	"description": "This project is made possible to get data from Forex market, execute market or limit order with NodeJS/JS through WebSocket connection",
-	"main": "build/index.js",
-	"types": "build/index.d.ts",
-	"dependencies": {
-		"logger4": "^2.1.5",
-		"ws": "^7.2.3"
-	},
-	"devDependencies": {
-		"@types/node": "^11.15.3",
-		"typescript": "^3.4.5",
-		"ts-mocha": "^8.0.0",
-		"@types/chai": "^4.2.14",
-		"@types/mocha": "^8.0.3",
-		"chai": "^4.2.0",
-		"mocha": "^8.2.0",
-		"ts-node": "^9.0.0"
-	},
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"build": "tsc"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/peterszombati/xapi-node.git"
-	},
-	"keywords": [
-		"xstation5",
-		"trading",
-		"xtb",
-		"bfbcapital",
-		"forex",
-		"trading-api",
-		"xopenhub"
-	],
-	"prepare": "npm run build",
-	"author": "Peter Szombati",
-	"license": "BSD 4-Clause",
-	"bugs": {
-		"url": "https://github.com/peterszombati/xapi-node/issues"
-	},
-	"homepage": "https://github.com/peterszombati/xapi-node#readme"
 }
diff --git a/sandbox/parseLoginFile.ts b/sandbox/parseLoginFile.ts
@@ -6,4 +6,4 @@ export function parseLoginFile(loginJsonFile: string): XAPIConfig {
     throw `${loginJsonFile} is not exists.`
   }
   return parseJsonLogin(fs.readFileSync(loginJsonFile).toString())
-}
+}
diff --git a/sandbox/sandbox.ts b/sandbox/sandbox.ts
@@ -42,4 +42,4 @@ describe('sandbox', () => {
 
     return await new Promise<void>(resolve => resolve())
   })
-})
+})
diff --git a/sandbox/test/connectionTest.ts b/sandbox/test/connectionTest.ts
@@ -1,11 +1,3 @@
-/* sensitive/sensitive.json
-{
-	"accountId": "",
-	"password": "",
-	"type": "real"
-}
- */
-
 import { XAPI } from '../../src/core/XAPI'
 import { ConnectionStatus } from '../../src'
 
diff --git a/sandbox/test/getCandlesTest.ts b/sandbox/test/getCandlesTest.ts
@@ -0,0 +1,21 @@
+import { XAPI } from '../../src/core/XAPI'
+import { ConnectionStatus } from '../../src'
+
+export function getCandlesTest(x: XAPI): Promise<void> {
+    return new Promise((resolve, reject) => {
+        try {
+            x.Stream.listen.getCandles((data => {
+                resolve()
+            }))
+            x.onReady(() => {
+                console.log('Connection is ready')
+                x.Stream.subscribe.getCandles('EURUSD')
+            })
+            x.onConnectionChange(status => {
+                console.log(ConnectionStatus[status])
+            })
+        } catch (e) {
+            reject(e)
+        }
+    })
+}
diff --git a/sandbox/test/messageQueuStressTest.ts b/sandbox/test/messageQueuStressTest.ts
@@ -1,11 +1,3 @@
-/* sensitive/sensitive.json
-{
-	"accountId": "",
-	"password": "",
-	"type": "real"
-}
- */
-
 import { XAPI } from '../../src/core/XAPI'
 import { Time } from '../../src'
 
diff --git a/sandbox/test/subscribeTest.ts b/sandbox/test/subscribeTest.ts
@@ -1,11 +1,3 @@
-/* sensitive/sensitive.json
-{
-	"accountId": "",
-	"password": "",
-	"type": "real"
-}
- */
-
 import { XAPI } from '../../src/core/XAPI'
 import { ConnectionStatus } from '../../src'
 
diff --git a/sandbox/tests.ts b/sandbox/tests.ts
@@ -6,8 +6,16 @@ import { tradeTest } from './test/tradeTest'
 import { connectionTest } from './test/connectionTest'
 import { messageQueuStressTest } from './test/messageQueuStressTest'
 import { subscribeTest } from './test/subscribeTest'
+import { getCandlesTest } from './test/getCandlesTest'
 
 const jsonPath = path.join(process.cwd(), 'sensitive', 'sensitive-demo-login.json')
+/* sensitive/sensitive-demo-login.json
+{
+	"accountId": "",
+	"password": "",
+	"type": "real"
+}
+ */
 
 async function init(): Promise<XAPI> {
   const login = parseLoginFile(jsonPath)
@@ -29,6 +37,14 @@ describe('tests', () => {
     x.disconnect()
   })
 
+  it('candleTest', async function () {
+    this.timeout(8000)
+    const x = await init()
+    await getCandlesTest(x)
+    x.disconnect()
+  })
+
+
   it('subscribeTest', async function () {
     this.timeout(8000)
     const x = await init()
@@ -42,4 +58,4 @@ describe('tests', () => {
     await tradeTest(x)
     x.disconnect()
   })
-})
+})
diff --git a/src/core/OpenPosition.ts b/src/core/OpenPosition.ts
@@ -31,4 +31,4 @@ export class OpenPosition extends TradeRecord {
       customComment: params.customComment || undefined,
     })
   }
-}
+}
diff --git a/src/core/PendingOrder.ts b/src/core/PendingOrder.ts
@@ -30,4 +30,4 @@ export class PendingOrder extends TradeRecord {
       customComment: params.customComment,
     })
   }
-}
+}
diff --git a/src/core/Queue.ts b/src/core/Queue.ts
@@ -240,8 +240,9 @@ export class Queue extends Listener {
         if (sentTime !== null) {
           this.addElapsedTime(sentTime)
           transaction.request.sent = sentTime
-          transaction.status =
-            transaction.type === TransactionType.STREAM ? TransactionStatus.successful : TransactionStatus.sent
+          transaction.status = transaction.type === TransactionType.STREAM
+            ? TransactionStatus.successful
+            : TransactionStatus.sent
           if (transaction.type === TransactionType.STREAM) {
             this.resolveTransaction('', null, new Time(), transaction)
           }
@@ -342,4 +343,4 @@ export class Queue extends Listener {
       }
     }
   }
-}
+}
diff --git a/src/core/Socket/Socket.ts b/src/core/Socket/Socket.ts
@@ -271,4 +271,4 @@ export class Socket extends SocketConnection {
   constructor(XAPI: XAPI, password: string) {
     super(XAPI, password, 'wss://' + XAPI.hostName + '/' + XAPI.accountType)
   }
-}
+}
diff --git a/src/core/Stream/Stream.ts b/src/core/Stream/Stream.ts
@@ -60,4 +60,4 @@ export class Stream extends StreamConnection {
   constructor(XAPI: XAPI) {
     super(XAPI, 'wss://' + XAPI.hostName + '/' + XAPI.accountType + 'Stream')
   }
-}
+}
diff --git a/src/core/Stream/StreamConnection.ts b/src/core/Stream/StreamConnection.ts
@@ -142,4 +142,4 @@ export class StreamConnection extends Queue {
       }
     }
   }
-}
+}
diff --git a/src/enum/Enum.ts b/src/enum/Enum.ts
@@ -122,7 +122,7 @@ export enum Listeners {
   xapi_onReady = 'xapi_onReady',
 }
 
-export const Currency2Pair: any = {
+export const Currency2Pair: Record<string, string> = {
   HUF: 'EURHUF',
   USD: 'EURUSD',
   JPY: 'USDJPY',
@@ -148,7 +148,7 @@ export const Currency2Pair: any = {
 }
 
 export type RelevantCurrencies =
-  | 'HUF'
+  'HUF'
   | 'USD'
   | 'JPY'
   | 'GBP'
diff --git a/src/interface/Definitions.ts b/src/interface/Definitions.ts
@@ -90,7 +90,7 @@ export interface STREAMING_TRADE_STATUS_RECORD {
   customComment: string | null
   message: string | null
   order: number
-  price: number | null | undefined
+  price: number | null | undefined // TODO check undefined is possible or not
   requestStatus: REQUEST_STATUS_FIELD | null
 }
 
@@ -327,4 +327,4 @@ export interface STREAMING_TRADE_RECORD {
 
   type: TYPE_FIELD
   state: STATE_FIELD
-}
+}
diff --git a/src/interface/Interface.ts b/src/interface/Interface.ts
@@ -68,4 +68,4 @@ export interface TradeStatus {
   message: string | null
   order: number
   requestStatus: REQUEST_STATUS_FIELD | null
-}
+}
diff --git a/src/interface/Request.ts b/src/interface/Request.ts
@@ -62,4 +62,4 @@ export interface tradeTransaction {
 
 export interface tradeTransactionStatus {
   order: number
-}
+}
diff --git a/src/interface/Response.ts b/src/interface/Response.ts
@@ -64,4 +64,4 @@ export interface tradeTransactionStatusResponse {
   message: string
   order: number
   requestStatus: REQUEST_STATUS_FIELD
-}
+}
diff --git a/src/modules/Listener.ts b/src/modules/Listener.ts
@@ -37,7 +37,9 @@ export class Listener {
       if (this._listeners[listenerId] === undefined) {
         this._listeners[listenerId] = {}
       }
-      key = key === null ? 'g' + Object.keys(this._listeners[listenerId]).length : 's' + key
+      key = key === null
+          ? 'g' + Object.keys(this._listeners[listenerId]).length
+          : 's' + key
       this._listeners[listenerId][key] = callBack
       return new ListenerChild(this, listenerId, key)
     }
@@ -61,4 +63,4 @@ export class Listener {
     }
     return values
   }
-}
+}
diff --git a/src/modules/Timer.ts b/src/modules/Timer.ts
@@ -31,4 +31,4 @@ export class Timer {
   isNull() {
     return this.interval === null && this.timeout === null
   }
-}
+}
diff --git a/src/modules/parseJsonLogin.ts b/src/modules/parseJsonLogin.ts
@@ -27,4 +27,4 @@ export function parseJsonLogin(jsonString: string): XAPIConfig {
     throw new Error('json not contains valid type (it should be "real" or "demo")')
   }
   return { accountId, password, type: type.toLowerCase() as 'real' | 'demo', rateLimit, host, appName }
-}
+}
diff --git a/src/utils/formatNumber.ts b/src/utils/formatNumber.ts
@@ -1,4 +1,6 @@
 export function formatNumber(number: number, length: number): string {
   const result = number.toString()
-  return length - result.length > 0 ? '0'.repeat(length - result.length) + result : result
-}
+  return length - result.length > 0
+      ? '0'.repeat(length - result.length) + result
+      : result
+}
diff --git a/src/utils/getObjectChanges.ts b/src/utils/getObjectChanges.ts
@@ -11,4 +11,4 @@ export function getObjectChanges(from: TradeRecord, to: TradeRecord) {
       obj[key] = to[key]
     })
   return obj
-}
+}
diff --git a/src/utils/getPositionType.ts b/src/utils/getPositionType.ts
@@ -10,8 +10,12 @@ export function getPositionType({
   close_time: number
 }): PositionType {
   if (cmd === CMD_FIELD.SELL || cmd === CMD_FIELD.BUY) {
-    return close_time === null && !closed ? PositionType.open : PositionType.closed
+    return close_time === null && !closed
+      ? PositionType.open
+      : PositionType.closed
   } else {
-    return cmd === CMD_FIELD.BALANCE || cmd === CMD_FIELD.CREDIT ? PositionType.source : PositionType.limit
+    return cmd === CMD_FIELD.BALANCE || cmd === CMD_FIELD.CREDIT
+      ? PositionType.source
+      : PositionType.limit
   }
-}
+}
diff --git a/src/utils/getUTCTimestampString.ts b/src/utils/getUTCTimestampString.ts
@@ -1,3 +1,3 @@
 export function getUTCTimestampString(): string {
   return new Date().getTime().toString()
-}
+}
diff --git a/src/utils/hideSecretInfo.ts b/src/utils/hideSecretInfo.ts
@@ -9,4 +9,4 @@ export function hideSecretInfo(transaction: Transaction<any, any>): Transaction<
       arguments: {},
     },
   }
-}
+}
diff --git a/src/utils/parseCustomTag.ts b/src/utils/parseCustomTag.ts
diff --git a/src/utils/transactionToJSONString.ts b/src/utils/transactionToJSONString.ts

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ export function parseLoginFile(loginJsonFile: string): XAPIConfig {`
`6`	`6`	throw `${loginJsonFile} is not exists.`
`7`	`7`	`}`
`8`	`8`	`return parseJsonLogin(fs.readFileSync(loginJsonFile).toString())`
`9`		`-}`
	`9`	`+}`
-Original file line number
+Diff line change
     return await new Promise<void>(resolve => resolve())
   })
 -})
 +})
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,4 @@ export class OpenPosition extends TradeRecord {`
`31`	`31`	`customComment: params.customComment \|\| undefined,`
`32`	`32`	`})`
`33`	`33`	`}`
`34`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ export class PendingOrder extends TradeRecord {`
`30`	`30`	`customComment: params.customComment,`
`31`	`31`	`})`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`