From b7a01242c8ca42fe37a100cdd871fbdefa90b364 Mon Sep 17 00:00:00 2001 From: Jeremy Cunningham Date: Thu, 3 Sep 2020 03:43:33 -0500 Subject: [PATCH 1/4] improve openaps plugin performance --- lib/plugins/openaps.js | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js index 59af42c0e61..55cd089df86 100644 --- a/lib/plugins/openaps.js +++ b/lib/plugins/openaps.js @@ -123,12 +123,42 @@ function init (ctx) { } function toMoments (status) { + var enacted = false; + var notEnacted = false; + if (status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received)) { + if (status.openaps.enacted.mills) { + enacted = moment(status.openaps.enacted.mills); + } else { + enacted = moment(status.openaps.enacted.timestamp); + } + } else if (status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.received)) { + if (status.openaps.enacted.mills) { + moment(status.openaps.enacted.mills) + } else { + moment(status.openaps.enacted.timestamp) + } + } + + var suggested = false; + if (status.openaps.suggested && status.openaps.suggested.mills) { + suggested = moment(status.openaps.suggested.mills); + } else if (status.openaps.suggested && status.openaps.suggested.timestamp) { + suggested = moment(status.openaps.suggested.timestamp); + } + + var iob = false; + if (status.openaps.iob && status.openaps.iob.mills) { + iob = moment(status.openaps.iob.mills); + } else if (status.openaps.iob && status.openaps.iob.timestamp) { + iob = moment(status.openaps.iob.timestamp); + } + return { when: moment(status.mills) - , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp) - , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp) - , suggested: status.openaps.suggested && status.openaps.suggested.timestamp && moment(status.openaps.suggested.timestamp) - , iob: status.openaps.iob && status.openaps.iob.timestamp && moment(status.openaps.iob.timestamp) + , enacted + , notEnacted + , suggested + , iob }; } From 4d83547a1b4405ea13277eb01c5fb797d3e499d1 Mon Sep 17 00:00:00 2001 From: Jeremy Cunningham Date: Thu, 3 Sep 2020 04:08:46 -0500 Subject: [PATCH 2/4] more performance improvements (cherry picked from commit 076a2dd3b69093149994258eb0244ae61d68f44e) --- lib/plugins/openaps.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js index 55cd089df86..0f27f952cbd 100644 --- a/lib/plugins/openaps.js +++ b/lib/plugins/openaps.js @@ -205,7 +205,11 @@ function init (ctx) { var enacted = status.openaps && status.openaps.enacted; if (enacted && moments.enacted && (!result.lastEnacted || moments.enacted.isAfter(result.lastEnacted.moment))) { - enacted.moment = moment(enacted.timestamp); + if (enacted.mills) { + enacted.moment = moment(enacted.mills); + } else { + enacted.moment = moment(enacted.timestamp); + } result.lastEnacted = enacted; if (enacted.predBGs && (!result.lastPredBGs || enacted.moment.isAfter(result.lastPredBGs.moment))) { result.lastPredBGs = _.isArray(enacted.predBGs) ? { values: enacted.predBGs } : enacted.predBGs; @@ -214,13 +218,21 @@ function init (ctx) { } if (enacted && moments.notEnacted && (!result.lastNotEnacted || moments.notEnacted.isAfter(result.lastNotEnacted.moment))) { - enacted.moment = moment(enacted.timestamp); + if (enacted.mills) { + enacted.moment = moment(enacted.mills); + } else { + enacted.moment = moment(enacted.timestamp); + } result.lastNotEnacted = enacted; } var suggested = status.openaps && status.openaps.suggested; if (suggested && moments.suggested && (!result.lastSuggested || moments.suggested.isAfter(result.lastSuggested.moment))) { - suggested.moment = moment(suggested.timestamp); + if (suggested.mills) { + suggested.moment = moment(suggested.mills); + } else { + suggested.moment = moment(suggested.timestamp); + } result.lastSuggested = suggested; if (suggested.predBGs && (!result.lastPredBGs || suggested.moment.isAfter(result.lastPredBGs.moment))) { result.lastPredBGs = _.isArray(suggested.predBGs) ? { values: suggested.predBGs } : suggested.predBGs; From 023e361c2dd481a1d11f6dfaafa14d74d4674d04 Mon Sep 17 00:00:00 2001 From: Jeremy Cunningham Date: Thu, 3 Sep 2020 06:28:15 -0500 Subject: [PATCH 3/4] correct setting notEnacted variable --- lib/plugins/openaps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js index 0f27f952cbd..037680960d2 100644 --- a/lib/plugins/openaps.js +++ b/lib/plugins/openaps.js @@ -133,9 +133,9 @@ function init (ctx) { } } else if (status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.received)) { if (status.openaps.enacted.mills) { - moment(status.openaps.enacted.mills) + notEnacted = moment(status.openaps.enacted.mills) } else { - moment(status.openaps.enacted.timestamp) + notEnacted = moment(status.openaps.enacted.timestamp) } } From 7aca857ae8dd5dda8138343fcadcbc0bb3492981 Mon Sep 17 00:00:00 2001 From: Jeremy Cunningham Date: Fri, 4 Sep 2020 06:13:49 -0500 Subject: [PATCH 4/4] remove unnecessary debug logging --- lib/client/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/client/index.js b/lib/client/index.js index c7487c6b410..ce8efa92f38 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -405,7 +405,6 @@ client.load = function load (serverSettings, callback) { function updateBolusRenderOver () { var bolusRenderOver = (client.settings.bolusRenderOver || 1) + ' U and Over'; $('#bolusRenderOver').text(bolusRenderOver); - console.log('here'); } function alarmingNow () { @@ -434,7 +433,7 @@ client.load = function load (serverSettings, callback) { brushExtent = brushedRange.map(chart.xScale2.invert); } - console.log('brushed(): Brushed to: ', brushExtent); + // console.log('brushed(): Brushed to: ', brushExtent); if (!brushedRange || (brushExtent[1].getTime() - brushExtent[0].getTime() !== client.focusRangeMS)) { // ensure that brush updating is with the time range