diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index 262877a6a..f978ceb32 100644 Binary files a/.vs/AACloudPlatform/v15/.suo and b/.vs/AACloudPlatform/v15/.suo differ diff --git a/Assistant.js b/Assistant.js index adab23e4a..3237cccd1 100644 --- a/Assistant.js +++ b/Assistant.js @@ -29,13 +29,6 @@ let processDatetime; let exchangeAPI; - /* The current bots trades only at one market: USDT_BTC. */ - - const MARKET = { - assetA: "USDT", - assetB: "BTC", - }; - return thisObject; function initialize(pProcessDatetime, pBotContext, pExchangeAPI, callBackFunction) { @@ -99,7 +92,7 @@ */ - exchangeAPI.getOpenPositions(MARKET, onResponse); + exchangeAPI.getOpenPositions(global.MARKET, onResponse); function onResponse(err, pExchangePositions) { @@ -432,7 +425,7 @@ function putPositionAtExchange(pType, pRate, pAmountA, pAmountB, callBack) { try { - exchangeAPI.putPosition(MARKET, pType, pRate, pAmountA, pAmountB, onResponse); + exchangeAPI.putPosition(global.MARKET, pType, pRate, pAmountA, pAmountB, onResponse); function onResponse(err, pPositionId) { diff --git a/Context.js b/Context.js index e395b8231..1694892b9 100644 --- a/Context.js +++ b/Context.js @@ -66,8 +66,6 @@ let processDatetime; - const EXCHANGE_NAME = "Poloniex"; - return thisObject; function initialize(pProcessDatetime, callBackFunction) { @@ -109,6 +107,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { + logger.write("[INFO] initialize -> onDone -> Execution finished well. :-)"); callBackFunction(global.DEFAULT_OK_RESPONSE); return; } @@ -140,7 +139,7 @@ if (FULL_LOG === true) { logger.write("[INFO] initialize -> getStatusReport -> Entering function."); } let fileName = "Status.Report.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.EXCHANGE_NAME; cloudStorage.getTextFile(filePath, fileName, onFileReceived); @@ -194,7 +193,7 @@ if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> Entering function."); } let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME; cloudStorage.getTextFile(filePath, fileName, onFileReceived); @@ -245,7 +244,7 @@ let fileName = "Execution.Context.json" let dateForPath = date.getUTCFullYear() + '/' + utilities.pad(date.getUTCMonth() + 1, 2) + '/' + utilities.pad(date.getUTCDate(), 2) + '/' + utilities.pad(date.getUTCHours(), 2) + '/' + utilities.pad(date.getUTCMinutes(), 2); - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + EXCHANGE_NAME + "/" + dateForPath; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME + "/" + dateForPath; cloudStorage.getTextFile(filePath, fileName, onFileReceived); @@ -339,6 +338,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { + logger.write("[INFO] initialize -> onDone -> Execution finished well. :-)"); callBackFunction(global.DEFAULT_OK_RESPONSE); return; } @@ -373,7 +373,7 @@ let fileName = "Execution.Context.json" let dateForPath = processDatetime.getUTCFullYear() + '/' + utilities.pad(processDatetime.getUTCMonth() + 1, 2) + '/' + utilities.pad(processDatetime.getUTCDate(), 2) + '/' + utilities.pad(processDatetime.getUTCHours(), 2) + '/' + utilities.pad(processDatetime.getUTCMinutes(), 2); - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + EXCHANGE_NAME + "/" + dateForPath; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME + "/" + dateForPath; utilities.createFolderIfNeeded(filePath, cloudStorage, onFolderCreated); @@ -428,7 +428,7 @@ try { let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME; utilities.createFolderIfNeeded(filePath, cloudStorage, onFolderCreated); @@ -493,7 +493,7 @@ try { let fileName = "Status.Report.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.version + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.EXCHANGE_NAME; utilities.createFolderIfNeeded(filePath, cloudStorage, onFolderCreated); diff --git a/Datasource.js b/Datasource.js index 40f23674a..def11fc87 100644 --- a/Datasource.js +++ b/Datasource.js @@ -99,6 +99,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { + logger.write("[INFO] initialize -> onDone -> Execution finished well. :-)"); callBackFunction(global.DEFAULT_OK_RESPONSE); return; } @@ -400,12 +401,19 @@ } } - function getFile(pFileService, pFileName, pFilePath, pPeriodName, pDatetime, innerCallBack, outerCallBack) { - try { - pFileName = pFileName.replace("@AssetA", market.assetA); - pFileName = pFileName.replace("@AssetB", market.assetB); + function getFile(pFileStorage, pFileName, pFilePath, pPeriodName, pDatetime, innerCallBack, outerCallBack) { - pFilePath = pFilePath.replace("@Exchange", EXCHANGE_NAME); + try { + if (FULL_LOG === true) { logger.write("[INFO] initialize -> getFile -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> getFile -> pFileName = " + pFileName); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> getFile -> pFilePath = " + pFilePath); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> getFile -> pPeriodName = " + pPeriodName); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> getFile -> pDatetime = " + pDatetime); } + + pFileName = pFileName.replace("@AssetA", MARKET.assetA); + pFileName = pFileName.replace("@AssetB", MARKET.assetB); + + pFilePath = pFilePath.replace("@Exchange", global.EXCHANGE_NAME); pFilePath = pFilePath.replace("@Period", pPeriodName); if (pDatetime !== undefined) { @@ -416,7 +424,7 @@ } - pFileService.getTextFile(pFilePath, pFileName, onFileReceived); + pFileStorage.getTextFile(pFilePath, pFileName, onFileReceived); function onFileReceived(err, text) { diff --git a/ExchangeAPI.js b/ExchangeAPI.js index c2ac09e49..377d1ecc7 100644 --- a/ExchangeAPI.js +++ b/ExchangeAPI.js @@ -43,7 +43,7 @@ try { let fs = require('fs'); - let filePath = '../' + 'API-Keys' + '/' + bot.codeName + '.' + EXCHANGE_NAME + '.json'; + let filePath = '../' + 'API-Keys' + '/' + bot.codeName + '.' + global.EXCHANGE_NAME + '.json'; return JSON.parse(fs.readFileSync(filePath, 'utf8')); } catch (err) { diff --git a/Run.js b/Run.js index d596fb612..7097f8ece 100644 --- a/Run.js +++ b/Run.js @@ -66,21 +66,34 @@ process.on('exit', function (code) { logger.write('About to exit with code:' + code); }); +/* Global constants definitions. */ + +/* Callbacks default responses. */ + global.DEFAULT_OK_RESPONSE = { result: "Ok", message: "Operation Succeeded" }; -global.global.DEFAULT_FAIL_RESPONSE = { +global.DEFAULT_FAIL_RESPONSE = { result: "Fail", message: "Operation Failed" }; -global.global.DEFAULT_RETRY_RESPONSE = { +global.DEFAULT_RETRY_RESPONSE = { result: "Retry", message: "Retry Later" }; +/* Current state of the art fixed parameters */ + +global.MARKET = { + assetA: "USDT", + assetB: "BTC", +}; + +global.EXCHANGE_NAME = "Poloniex"; + const START_ALL_MONTHS = false;