From cf09500ea587dc4cb6cfe0a23f29e5590da6e66f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Mar 2018 13:20:05 +0100 Subject: [PATCH] Initialize and Commons --- .vs/AABruce-Indicator-Bot/v15/.suo | Bin 23040 -> 24064 bytes Commons.js | 73 ++++++++++++++++++ .../{Interval.js => User.bot.js} | 52 +++++++------ Project.njsproj | 5 +- this.bot.config.json | 3 +- 5 files changed, 108 insertions(+), 25 deletions(-) create mode 100644 Commons.js rename One-Min-Daily-Candles-Volumes/{Interval.js => User.bot.js} (96%) diff --git a/.vs/AABruce-Indicator-Bot/v15/.suo b/.vs/AABruce-Indicator-Bot/v15/.suo index 1234d51b64859dbf57552d8863c3ac1ed531ee86..7b3d52fa8bcb874b205abd81aa29c8a7e681afd4 100644 GIT binary patch delta 1940 zcmd5+OHUhD6rMXC!!RB@yaMJGYy*ueVw<771Be7iK^Pd`eWfV|OcV+pG@hwqAoWzu zu8V?CRW_+qWfQ5bAnkNhwN)(WKi$5N`h~a|hB2J5&aRU%q}hbE4jmH^x5&H|N00CWQqx%Q z3L0lvcwkvBslg%5szp>IT%dEE@VUT~hhI#DNRk~PMRX5)>hQrV-NTMa2E^G7G6U&? z_t*jptXqaf5#9NFkTFOX)>jpxy9mJ}3J^8~O%+TZzrey4$MFyGR1|PiaPch|%Nlou zIWi1xp{!0u*EnJVF^QN$Oe3=MwkJMIwrOM(bTL6jAT5sB8G1qsB3CX6fo^|4*)_yd z5B=yRm|FR-gfGj_lR&SKMF+ZEd2TqYknKzbdQRkd$!X9lWw97tw65H$))&xVA=56y zJ@yP}4jJ}Y2@W0OA}w9WO9kyjHfW`VFpwz;!Ckh+)OutB`(=H%irFun`#2ozOI8O( z`n2>Ca~r{ci!-lPr+IP%q78fGXV~(5cXEb_F%d>({LDO~FdF_}W@7L|zm`MvK(2^lHS{`GqH&3pI0>ha%^*RLuy-;I=ee0-%_Mq^0jreE&948N%AeU zg_k60v2(GzJ8a(fULhU-ecpAJ3BqsQZ%nD#L5c>jlm#Kgb0A=_$yR5Uu=JiOY3Xax$DxF^ zQ!bKH`fII3+et?-Cvf&tXw@TJ2sgaTRsO^1PlQ^LGFn1pS$$8q^x`lYA;bt`6fuT) zCdcUxO|N3~HN@+PONciRml1Cw<`73J*q|zS8C5XFQ~u^yLS|7Ck6B8KICjr~-j0em zB(;z(pW@5&V>O_6C#QP7H`9Uj&z4n)dydNIfAcu@pXJQZBdWj&1s3cxP& z`5H8}j%flzj;>_s5Ko&zE+4c~gH%DfCqXJeKbx?g#2^ouz75cvwXjvZ2q`xQe-&>M z2k0dUE0xg>WU4|UeV)?%rBD*=E-}{!4v0wm*%RU}2i=(F?538O)e|FVp zA0hyx?iA@ack8~lvOh7PH0;8fryhQ6{2E$V8*18MZ9B+VTC9cH1Dp4q!a-$qRf)!6 z&)ZD(^&BdP``!cc)MA{42|nc%g`@3IZ^Q6`Z@~61J1>5u$Ht|5;1W@J=~M r`3>4$AsD#Be#F4G$EX~{cDjmx3KPW^n{BJ~zTuC+pSL6eE-Cdl51vg9 delta 1237 zcmd5*%}*0i5brFz?W28L7Hlh@QWOzCz+xm|k)#1*P}*+!il`URcri+h*%|~BYP^up z1MJ+4CK?WM6Io8iL=!PVJQ+E9^B>TpJ=B9b53{gU!R2zrf;c5j!7%2f8KsJdk9fO8XAE;QB=6@k(F(yX013={ z>Z`m&l@d6?M_>du!DF?s%M$-a;Q|MU!Ux_k6Godb*1Tib=+%NrGITWSuZM}oD=O?YqQM$o$Ys@@WiIv{Tf0o?PmZ2bJU}^}b72{kSy-vP?)gvVqFg-AUVomCA3YYG@c;k- diff --git a/Commons.js b/Commons.js new file mode 100644 index 000000000..8602f65bf --- /dev/null +++ b/Commons.js @@ -0,0 +1,73 @@ +exports.newCommons = function newCommons(BOT, DEBUG_MODULE, UTILITIES) { + + const FULL_LOG = true; + const LOG_FILE_CONTENT = false; + + const MODULE_NAME = "Commons"; + + const ONE_DAY_IN_MILISECONDS = 24 * 60 * 60 * 1000; + const GMT_SECONDS = ':00.000 GMT+0000'; + + let thisObject = { + initializeStorage: initializeStorage + }; + + let bot = BOT; + + const logger = DEBUG_MODULE.newDebugLog(); + logger.fileName = MODULE_NAME; + logger.bot = bot; + + let utilities = UTILITIES.newUtilities(bot); + + return thisObject; + + function initializeStorage(charlyFileStorage, bruceFileStorage, callBackFunction) { + + try { + + if (FULL_LOG === true) { logger.write("[INFO] initializeStorage -> Entering function."); } + + initializeBruceStorage(); + + function initializeBruceStorage() { + + bruceFileStorage.initialize("AABruce", onBruceInizialized); + + function onBruceInizialized(err) { + + if (err.result === global.DEFAULT_OK_RESPONSE.result) { + + initializeCharlyStorage(); + + } else { + logger.write("[ERROR] initializeStorage -> initializeBruceStorage -> onBruceInizialized -> err = " + err.message); + callBackFunction(err); + } + } + } + + function initializeCharlyStorage() { + + charlyFileStorage.initialize("AACharly", onCharlyInizialized); + + function onCharlyInizialized(err) { + + if (err.result === global.DEFAULT_OK_RESPONSE.result) { + + callBackFunction(global.DEFAULT_OK_RESPONSE); + + } else { + logger.write("[ERROR] initializeStorage -> initializeCharlyStorage -> onCharlyInizialized -> err = " + err.message); + callBackFunction(err); + } + } + } + } + catch (err) { + logger.write("[ERROR] initializeStorage -> err = " + err.message); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); + } + } + +}; \ No newline at end of file diff --git a/One-Min-Daily-Candles-Volumes/Interval.js b/One-Min-Daily-Candles-Volumes/User.bot.js similarity index 96% rename from One-Min-Daily-Candles-Volumes/Interval.js rename to One-Min-Daily-Candles-Volumes/User.bot.js index 26037f4fa..72e7cc17a 100644 --- a/One-Min-Daily-Candles-Volumes/Interval.js +++ b/One-Min-Daily-Candles-Volumes/User.bot.js @@ -25,6 +25,8 @@ logger.fileName = MODULE_NAME; logger.bot = bot; + const commons = COMMONS.newCommons(bot, DEBUG_MODULE, UTILITIES); + thisObject = { initialize: initialize, start: start @@ -42,44 +44,48 @@ return thisObject; - function initialize(yearAssigend, monthAssigned, callBackFunction) { + function initialize(pDependencies, pMonth, pYear, callBackFunction) { try { - year = yearAssigend; - month = monthAssigned; - + year = pYear; + month = pMonth; month = utilities.pad(month, 2); // Adding a left zero when needed. + dependencies = pDependencies; logger.fileName = MODULE_NAME + "-" + year + "-" + month; - const logText = "[INFO] initialize - Entering function 'initialize' " + " @ " + year + "-" + month; - console.log(logText); - logger.write(logText); + if (FULL_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> pYear = " + year); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> pMonth = " + month); } - charlyFileStorage.initialize("Charly"); - bruceFileStorage.initialize("Bruce"); + dependencies = pDependencies; - markets = MARKETS_MODULE.newMarkets(bot); - markets.initialize(callBackFunction); + commons.initializeStorage(charlyFileStorage, bruceFileStorage, onInizialized); + function onInizialized(err) { + + if (err.result === global.DEFAULT_OK_RESPONSE.result) { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onInizialized -> Initialization Succeed."); } + callBackFunction(global.DEFAULT_OK_RESPONSE); + + } else { + logger.write("[ERROR] initialize -> onInizialized -> err = " + err.message); + callBackFunction(err); + } + } } catch (err) { - - const logText = "[ERROR] initialize - ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - + logger.write("[ERROR] initialize -> err = " + err.message); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } -/* - -This process is going to do the following: - -Read the trades from Charly's Output and pack them into daily files with candles of one minute. - -*/ + /* + This process is going to do the following: + Read the trades from Charly's Output and pack them into daily files with candles of one minute. + */ function start(callBackFunction) { diff --git a/Project.njsproj b/Project.njsproj index 8a269f3c9..b4ee6a319 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -21,7 +21,10 @@ - + + Code + + diff --git a/this.bot.config.json b/this.bot.config.json index 93bbe382d..132d337bb 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -61,7 +61,8 @@ "minor": 0 }, "process": "One-Min-Daily-Candles-Volumes", - "dataSetVersion": "dataSet.V1" + "dataSetVersion": "dataSet.V1", + "dataSetSection": "Month" } ] }