From 772482e1569ac442303c0b90ae204cc41e3dc0e5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 16 Oct 2019 19:14:22 +0200 Subject: [PATCH] Bug fixed undefined in logs --- DebugLog.js | 4 ++-- Session.js | 3 ++- package-lock.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + server.js | 29 ++++++++++++++++++++++++++++- 5 files changed, 80 insertions(+), 4 deletions(-) diff --git a/DebugLog.js b/DebugLog.js index d2f34a057..cf1a694c1 100644 --- a/DebugLog.js +++ b/DebugLog.js @@ -69,7 +69,7 @@ exports.newDebugLog = function newDebugLog() { let filePath = thisObject.bot.filePathRoot + "/Logs/" + thisObject.bot.process + "/" if (thisObject.bot.SESSION !== undefined) { - filePath = filePath + thisObject.bot.SESSION.name + "/" + executionDatetime; + filePath = filePath + thisObject.bot.SESSION.id + "/" + executionDatetime; } else { filePath = filePath + executionDatetime; } @@ -101,7 +101,7 @@ exports.newDebugLog = function newDebugLog() { if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - console.log("[ERROR] DebugLog -> persist -> onInizialized -> onFileCreated -> err = "+ err.stack); + console.log("[ERROR] DebugLog -> persist -> onInizialized -> onFileCreated -> err = "+ err.message); setTimeout(writeLog, 10000); // Lets retry until we make it. return; diff --git a/Session.js b/Session.js index 6d5a718d7..5ff67d6f6 100644 --- a/Session.js +++ b/Session.js @@ -15,7 +15,8 @@ /* Initialize this info so that everything is logged propeerly */ bot.SESSION = { - name: bot.processNode.session.name + name: bot.processNode.session.name, + id: bot.processNode.session.id } /* Check if there is a session */ diff --git a/package-lock.json b/package-lock.json index 400d53cef..8d6660151 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,11 @@ "resolved": "https://registry.npmjs.org/@superalgos/mqservice/-/mqservice-0.0.17.tgz", "integrity": "sha512-mxg2AtfFJ78n/p+JK/o6nTrnR+ZPlBNcq7k+6Epnl1t63ldrcm98WOgIQZaNezPPf0E7gSjVX3p+uZO1Ass0kA==" }, + "@types/node": { + "version": "12.7.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz", + "integrity": "sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==" + }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -458,6 +463,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-ipc": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz", @@ -572,6 +582,11 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "sandwich-stream": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sandwich-stream/-/sandwich-stream-2.0.2.tgz", + "integrity": "sha512-jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==" + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -652,6 +667,38 @@ } } }, + "telegraf": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-3.32.0.tgz", + "integrity": "sha512-5ZHiovyuG1rVLygJjaqf57wDt8e1nijAinKXCxN1tyUZ4BcrkZW/z5rVTEXA+KegpFbWxKKv3KnJwUJrKDqD0Q==", + "requires": { + "@types/node": "12.7.12", + "debug": "4.1.1", + "node-fetch": "2.6.0", + "sandwich-stream": "2.0.2", + "telegram-typings": "3.6.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "telegram-typings": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/telegram-typings/-/telegram-typings-3.6.1.tgz", + "integrity": "sha512-njVv1EAhIZnmQVLocZEADYUyqA1WIXuVcDYlsp+mXua/XB0pxx+PKtMSPeZ/EE4wPWTw9h/hA9ASTT6yQelkiw==" + }, "text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", diff --git a/package.json b/package.json index d13992b3a..a32ca9fda 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "axios": "^0.19.0", "dotenv": "^8.0.0", "node-ipc": "^9.1.1", + "telegraf": "^3.32.0", "winston": "^3.2.1" } } diff --git a/server.js b/server.js index e167585f2..6490aef23 100644 --- a/server.js +++ b/server.js @@ -72,7 +72,7 @@ if (global.TASK_NODE !== undefined) { } else { // I use this section to debug in standalone mode. - let argument = '{"type":"Task","name":"New Task","bot":{"type":"Trading Engine","code":{"team":"AAMasters","bot":"AAJason","repo":"AAJason-Trading-Engine-Bot"},"processes":[{"type":"Process","subType":"Trading Engine Process","name":"Trading Engine Process","code":{"process":"Multi-Period"},"session":{"type":"Live Trading Session","name":"New Live Trading Session","id":"1be42eb3-bfaf-432f-8da6-15f15d547f50"},"id":"16d02098-221f-4d83-9682-a5f83262bb74"}],"id":"72cdfb23-b7c6-4feb-ba2d-d56415d30162"},"id":"c6fb2087-d2a2-49a0-9790-2c4d1cb015d7"}' + let argument = '{"type":"Task","name":"New Task","bot":{"type":"Trading Engine","code":{"team":"AAMasters","bot":"AAJason","repo":"AAJason-Trading-Engine-Bot"},"processes":[{"type":"Process","subType":"Trading Engine Process","name":"Multi Period","code":{"process":"Multi-Period"},"session":{"type":"Backtesting Session","name":"30min + 6hs down, dev < 15","id":"715839bb-a76c-427f-a48f-5bf1b2184070"},"id":"18dfca43-5015-40d9-824d-09b59b670e32"},{"type":"Process","subType":"Trading Engine Process","name":"Multi Period","code":{"process":"Multi-Period"},"session":{"type":"Backtesting Session","name":"30min + 6hs down, dev < 20","id":"7a681e8d-7167-4edb-bb2f-90e12c7f5418"},"id":"5ccdbb76-4e45-4377-bc44-fd0f95e40deb"}],"id":"22b61a44-4fcc-4f6d-bb7c-4c2a24acbfbc"},"id":"9238ed0b-7cc6-4732-83e6-8ac8d52f6dd3"}' /* charly argument = '{"type":"Task","name":"Brings Trades Records from the Exchange","bot":{"type":"Sensor","name":"Charly","processes":[{"type":"Process","name":"Live Trades","code":{"team":"AAMasters","bot":"AACharly","process":"Live-Trades"},"id":"5846ebc7-1979-4a80-9cc7-94bb4b8659dc"},{"type":"Process","name":"Hole Fixing","code":{"team":"AAMasters","bot":"AACharly","process":"Hole-Fixing"},"id":"31fc4f05-75d4-419a-9fb0-73e25e856f15"}]},"id":"5bfef4dc-54c1-44db-ace6-1ab27a86746e"}' // olivia argument = '{"type":"Task","name":"Generates 1 min to 24 hs Candles & Volumes","bot":{"type":"Indicator","name":"Olivia","processes":[{"type":"Process","name":"Daily","code":{"team":"AAMasters","bot":"AAOlivia","process":"Multi-Period-Daily"},"id":"68cc8e1b-e94a-477e-82d0-15ecc9f1b9e2"},{"type":"Process","name":"Market","code":{"team":"AAMasters","bot":"AAOlivia","process":"Multi-Period-Market"},"id":"e1ac5e3d-d491-4e90-baf4-d4e5b71a8b1a"}]},"id":"efe36e05-75ea-41b5-8d92-c6b27635c834"}' // bruce argument = ' {"type":"Task","name":"Converts Trades into 1 min Candles & Volumes","bot":{"type":"Indicator","name":"Bruce","processes":[{"type":"Process","name":"New Process","code":{"team":"AAMasters","bot":"AABruce","process":"Single-Period-Daily"},"id":"e184744f-5de0-41c1-ad4c-36960f4ced90"}]},"id":"42758590-a7bd-4712-a5c9-80a3a820c5b3"}' @@ -152,6 +152,28 @@ global.STOP_TASK_GRACEFULLY = false; function bootLoader() { + /* Telegram Bot Initialization */ + + try { +/* + const Telegraf = require('telegraf') + + global.TELEGRAM_BOT = new Telegraf(process.env.TELEGRAM_BOT_TOKEN) + global.TELEGRAM_BOT.start((ctx) => ctx.reply('Welcome')) + global.TELEGRAM_BOT.help((ctx) => ctx.reply('Send me a sticker')) + global.TELEGRAM_BOT.on('sticker', (ctx) => ctx.reply('??')) + global.TELEGRAM_BOT.hears('hi', (ctx) => ctx.reply('Hey there')) + global.TELEGRAM_BOT.launch() + + const Telegram = require('telegraf/telegram') + global.TELEGRAM_API = new Telegram(process.env.TELEGRAM_BOT_TOKEN) + global.TELEGRAM_API.sendMessage(process.env.TELEGRAM_GROUP_ID, "Task Manager Started.") +*/ + + } catch (err) { + console.log("[ERROR] Task Server -> server -> bootLoader -> Telegram Initialization Failed. -> Error = " + err.stack); + } + /* Heartbeat sent to the UI */ let key = global.TASK_NODE.name + '-' + global.TASK_NODE.type + '-' + global.TASK_NODE.id @@ -166,7 +188,12 @@ function bootLoader() { let event = { seconds: (new Date()).getSeconds() } + /* global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Heartbeat', event) + if (global.TELEGRAM_API !== undefined) { + global.TELEGRAM_API.sendMessage(process.env.TELEGRAM_GROUP_ID, "Task is Alive!") + } + */ } for (let processIndex = 0; processIndex < global.TASK_NODE.bot.processes.length; processIndex++) {