From d7054e2367448520d430fa556ac618512a4288d9 Mon Sep 17 00:00:00 2001 From: sacharbit Date: Mon, 15 Apr 2019 19:53:36 +0200 Subject: [PATCH 1/2] Changed 'startdate' to 'from' in histPrc function --- index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index b95969a..621a1ea 100644 --- a/index.js +++ b/index.js @@ -180,7 +180,7 @@ function login(encryption) { /** * Log in (retrive client and session tokens) * @param {boolean} encryption - * @return {json} + * @return {json} */ return new Promise((res, rej) => { encryption = typeof(encryption) === 'undefined' ? false : encryption; @@ -834,18 +834,18 @@ function marketNode(id) { function histPrc(epic, resolution, from, to) { /** - * @param {string} epic + * @param {string} epic * @param {string} resolution - * Permitted values are: DAY, HOUR, HOUR_2, HOUR_3, HOUR_4, MINUTE, MINUTE_10, MINUTE_15, MINUTE_2, MINUTE_3, + * Permitted values are: DAY, HOUR, HOUR_2, HOUR_3, HOUR_4, MINUTE, MINUTE_10, MINUTE_15, MINUTE_2, MINUTE_3, * MINUTE_30, MINUTE_5, MONTH, SECOND, WEEK * @param {from} string - * Permitted values are: + * Permitted values are: * * @param {to} string * Permitted values are: */ return new Promise((res, rej) => { - get('/prices/' + epic + '?resolution=' + resolution + '&startdate=' + from + '&to=' + to, 3) + get('/prices/' + epic + '?resolution=' + resolution + '&from=' + from + '&to=' + to, 3) .then(r => { if (r.status !== 200) { rej(r); @@ -1038,12 +1038,12 @@ function connectToLightstreamer() { // Subscribe to lightstreamer function subscribeToLightstreamer(subscriptionMode, items, fields, maxFreq) { /** - * @param {string} subscriptionMode + * @param {string} subscriptionMode * Permitted values are: MERGE, DISTINCT, RAW, COMMAND * @param {array} items * Array of epics with format: 'L1:'+epics * @param {fields} fields - * Permitted values are: MID_OPEN, HIGH, LOW, CHANGE, CHANGE_PCT, UPDATE_TIME, MARKET_DELAY, MARKET_STATE, BID, OFFER, + * Permitted values are: MID_OPEN, HIGH, LOW, CHANGE, CHANGE_PCT, UPDATE_TIME, MARKET_DELAY, MARKET_STATE, BID, OFFER, * STRIKE_PRICE, ODDS * @param {number} maxFreq * Number of max updated per second @@ -1140,4 +1140,4 @@ module.exports = { connectToLightstreamer: connectToLightstreamer, subscribeToLightstreamer: subscribeToLightstreamer, epicDetails: epicDetails -}; \ No newline at end of file +}; From b468741633ee56688ee36178f81f0ffbb876b21f Mon Sep 17 00:00:00 2001 From: sacharbit Date: Mon, 15 Apr 2019 19:58:28 +0200 Subject: [PATCH 2/2] Changed onItemUpdate to send the data to a callback function on Lightstreamer function --- index.js | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/index.js b/index.js index 621a1ea..850670d 100644 --- a/index.js +++ b/index.js @@ -1036,7 +1036,7 @@ function connectToLightstreamer() { } // Subscribe to lightstreamer -function subscribeToLightstreamer(subscriptionMode, items, fields, maxFreq) { +function subscribeToLightstreamer(subscriptionMode, items, fields, maxFreq, callbackOnUpdate) { /** * @param {string} subscriptionMode * Permitted values are: MERGE, DISTINCT, RAW, COMMAND @@ -1083,22 +1083,7 @@ function subscribeToLightstreamer(subscriptionMode, items, fields, maxFreq) { console.log('Update item lost'); }, - onItemUpdate: updateInfo => { - - str.push(new Date().getTime()); - - str.push(updateInfo.getItemName().split(':')[1]); // epic without 'L1:' - - updateInfo.forEachField((fieldName, fieldPos, value) => { - - str.push(value); - - }); - - //str.push(os.EOL); - console.log(str.join(',')); - str = []; - } + onItemUpdate: callbackOnUpdate }); // Subscribe to Lightstreamer