Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nightscout 14.0.4 Liquorice #6078

Merged
merged 7 commits into from
Sep 23, 2020
Merged

Nightscout 14.0.4 Liquorice #6078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c7e9bf
* Require created_at for Treatments on insert
sulkaharo Sep 19, 2020
f878ce1
Add support for CGM data and device statuses. Refactor dataloader to …
sulkaharo Sep 20, 2020
a75c5a3
Fix data order for REST API
sulkaharo Sep 20, 2020
1059232
* Add cache update events to websocket API
sulkaharo Sep 21, 2020
54008a7
Remove excess logging
sulkaharo Sep 22, 2020
cde9aa3
Merge pull request #6056 from nightscout/cache_invalidation
sulkaharo Sep 22, 2020
3f1081e
Bump version to .4
sulkaharo Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add support for CGM data and device statuses. Refactor dataloader to … 
…use the new model and reduce queries back down
  • Loading branch information
@sulkaharo
sulkaharo committed Sep 20, 2020
commit f878ce115b6db45665004374035b3f3c265e9703
21 changes: 12 additions & 9 deletions lib/api/entries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,9 @@ function configure (app, wares, ctx, env) {
function prepReqModel (req, model) {
var type = model || 'sgv';
if (!req.query.find) {

req.query.find = {
type: type
type: { "$eq" : type }
};
} else {
req.query.find.type = type;
Expand Down Expand Up @@ -447,6 +448,7 @@ function configure (app, wares, ctx, env) {
Object.keys(query.find).forEach(function(key) {
if (key == 'type') {
typeQuery = query.find[key]["$eq"];
if (!typeQuery) typeQuery = query.find.type;
} else {
inMemoryPossible = false;
}
Expand All @@ -456,14 +458,16 @@ function configure (app, wares, ctx, env) {
let inMemoryCollection;

if (typeQuery) {
if (typeQuery == 'sgv') inMemoryCollection = ctx.cache.sgvs;
if (typeQuery == 'mbg') inMemoryCollection = ctx.cache.mbgs;
if (typeQuery == 'cal') inMemoryCollection = ctx.cache.cals;
} else {
const merged = _.unionWith(ctx.cache.sgvs, ctx.cache.mbgs, ctx.cache.cals, function(a, b) {
return a._id == b._id;
inMemoryCollection= _.filter(ctx.cache.entries, function checkType (object) {
if (typeQuery == 'sgv') return 'sgv' in object;
if (typeQuery == 'mbg') return 'mbg' in object;
if (typeQuery == 'cal') return object.type === 'cal';
return false;
});
inMemoryCollection = _.sortBy(merged, function(item) {
} else {
inMemoryCollection = ctx.cache.getData('entries');

inMemoryCollection = _.sortBy(inMemoryCollection, function(item) {
return item.mills;
}).reverse();
}
Expand All @@ -475,7 +479,6 @@ function configure (app, wares, ctx, env) {
}

// If we get this far, query the database

// bias to entries, but allow expressing a preference
var storage = req.storage || ctx.entries;
// perform the query
Expand Down
83 changes: 36 additions & 47 deletions lib/data/dataloader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function init(env, ctx) {
}

// clear treatments to the base set, we're going to merge from multiple queries
ddata.treatments = ctx.cache.treatments ? _.cloneDeep(ctx.cache.treatments) : [];
ddata.treatments = []; // ctx.cache.treatments ? _.cloneDeep(ctx.cache.treatments) : [];

ddata.dbstats = {};

Expand All @@ -170,11 +170,11 @@ function init(env, ctx) {
function loadEntries(ddata, ctx, callback) {

const withFrame = ddata.page && ddata.page.frame;
const loadPeriod = ddata.sgvs && ddata.sgvs.length > 0 && !withFrame ? constants.ONE_HOUR : constants.TWO_DAYS;
const latestEntry = ddata.sgvs && ddata.sgvs.length > 0 ? findLatestMills(ddata.sgvs) : ddata.lastUpdated;
const longLoad = Math.round(constants.TWO_DAYS);
const loadTime = ctx.cache.isEmpty('entries') || withFrame ? longLoad : constants.FIFTEEN_MINUTES;

var dateRange = {
$gte: Math.min(ddata.lastUpdated - loadPeriod, latestEntry)
$gte: ddata.lastUpdated - loadTime
};
if (withFrame) {
dateRange['$lte'] = ddata.lastUpdated;
Expand All @@ -195,14 +195,18 @@ function loadEntries(ddata, ctx, callback) {
}

if (!err && results) {

const ageFilter = ddata.lastUpdated - constants.TWO_DAYS;
const r = ctx.ddata.processRawDataForRuntime(results);
ctx.cache.insertData('entries', r, ageFilter);

const currentData = ctx.cache.getData('entries');

const mbgs = [];
const sgvs = [];
const cals = [];
const shadowMbgs = [];
const shadowSgvs = [];
const shadowCals = [];

results.forEach(function(element) {
currentData.forEach(function(element) {
if (element) {
if (!element.mills) element.mills = element.date;
if (element.mbg) {
Expand All @@ -213,7 +217,6 @@ function loadEntries(ddata, ctx, callback) {
device: element.device,
type: 'mbg'
});
shadowMbgs.push(element);
} else if (element.sgv) {
sgvs.push({
_id: element._id,
Expand All @@ -227,7 +230,6 @@ function loadEntries(ddata, ctx, callback) {
rssi: element.rssi,
type: 'sgv'
});
shadowSgvs.push(element);
} else if (element.type === 'cal') {
cals.push({
_id: element._id,
Expand All @@ -237,20 +239,14 @@ function loadEntries(ddata, ctx, callback) {
slope: element.slope,
type: 'cal'
});
shadowCals.push(element);
}
}
});

const ageLimit = ddata.lastUpdated - constants.TWO_DAYS;

//stop using uniq for SGVs since we use buckets, also enables more detailed monitoring
ddata.sgvs = mergeProcessSort(ddata.sgvs, sgvs, ageLimit);
ddata.mbgs = mergeProcessSort(ddata.mbgs, uniqBasedOnMills(mbgs), ageLimit);
ddata.cals = mergeProcessSort(ddata.cals, uniqBasedOnMills(cals), ageLimit);
ctx.cache.sgvs = mergeProcessSort(ctx.cache.sgvs, shadowSgvs, ageLimit).reverse();
ctx.cache.mbgs = mergeProcessSort(ctx.cache.mbgs, uniqBasedOnMills(shadowMbgs), ageLimit).reverse();
ctx.cache.cals = mergeProcessSort(ctx.cache.cals, uniqBasedOnMills(shadowCals), ageLimit).reverse();
ddata.sgvs = sgvs;
ddata.mbgs = mbgs;
ddata.cals = cals;
}
callback();
});
Expand Down Expand Up @@ -307,18 +303,12 @@ function loadTreatments(ddata, ctx, callback) {
const longLoad = Math.round(constants.ONE_DAY * 2.5); //ONE_DAY * 2.5;

// Load 2.5 days to cover last 48 hours including overlapping temp boluses or temp targets for first load
// Subsequently load at least 15 minutes of data, but if latest entry is older than 15 minutes, load until that entry
// Subsequently load at least 15 minutes of data

let loadTime = ddata.lastUpdated - longLoad;
const loadTime = ctx.cache.isEmpty('treatments') || withFrame ? longLoad : constants.FIFTEEN_MINUTES;

if (ctx.cache.treatments.length > 0) {
const loadPeriod = ddata.treatments && ddata.treatments.length > 0 && !withFrame ? constants.SIX_HOURS : longLoad;
const latestEntry = ddata.treatments && ddata.treatments.length > 0 ? findLatestMills(ddata.treatments) : ddata.lastUpdated;
loadTime = Math.min(ddata.lastUpdated - loadPeriod, latestEntry);
}

var dateRange = {
$gte: new Date(loadTime).toISOString()
$gte: new Date(ddata.lastUpdated - loadTime).toISOString()
};
if (withFrame) {
dateRange['$lte'] = new Date(ddata.lastUpdated).toISOString();
Expand All @@ -335,9 +325,11 @@ function loadTreatments(ddata, ctx, callback) {
ctx.treatments.list(tq, function(err, results) {
if (!err && results) {
const ageFilter = ddata.lastUpdated - longLoad;
const r = ctx.ddata.processRawDataForRuntime(results);

// update cache
ctx.cache.treatments = mergeProcessSort(ctx.cache.treatments, results, ageFilter).reverse();
ddata.treatments = mergeProcessSort(ddata.treatments, _.cloneDeep(ctx.cache.treatments), ageFilter);
ctx.cache.insertData('treatments', r, ageFilter);
ddata.treatments = ctx.ddata.idMergePreferNew(ddata.treatments, ctx.cache.getData('treatments'));
}

callback();
Expand Down Expand Up @@ -458,21 +450,12 @@ function loadFood(ddata, ctx, callback) {

function loadDeviceStatus(ddata, env, ctx, callback) {

let loadPeriod = constants.ONE_DAY;
if(env.extendedSettings.devicestatus && env.extendedSettings.devicestatus.days && env.extendedSettings.devicestatus.days == 2) loadPeriod = constants.TWO_DAYS;

const withFrame = ddata.page && ddata.page.frame ? true : false;

if (!withFrame && ddata.devicestatus && ddata.devicestatus.length > 0) {
loadPeriod = constants.FIFTEEN_MINUTES;
}

let latestEntry = ddata.devicestatus && ddata.devicestatus.length > 0 ? findLatestMills(ddata.devicestatus) : ddata.lastUpdated;
if (!latestEntry) latestEntry = ddata.lastUpdated; // TODO find out why report test fails withtout this
const loadTime = Math.min(ddata.lastUpdated - loadPeriod, latestEntry);
const withFrame = ddata.page && ddata.page.frame;
const longLoad = env.extendedSettings.devicestatus && env.extendedSettings.devicestatus.days && env.extendedSettings.devicestatus.days == 2 ? constants.TWO_DAYS : constants.ONE_DAY;
const loadTime = ctx.cache.isEmpty('devicestatus') || withFrame ? longLoad : constants.FIFTEEN_MINUTES;

var dateRange = {
$gte: new Date( loadTime ).toISOString()
$gte: new Date( ddata.lastUpdated - loadTime ).toISOString()
};

if (withFrame) {
Expand All @@ -490,10 +473,15 @@ function loadDeviceStatus(ddata, env, ctx, callback) {

ctx.devicestatus.list(opts, function(err, results) {
if (!err && results) {
const ageFilter = ddata.lastUpdated - constants.TWO_DAYS;
ctx.cache.devicestatus = mergeProcessSort(ctx.cache.devicestatus, results, ageFilter);
// ctx.cache.devicestatus = mergeProcessSort(ctx.cache.devicestatus, results, ageFilter);

const r = _.map(results, function eachStatus(result) {
const ageFilter = ddata.lastUpdated - longLoad;
const r = ctx.ddata.processRawDataForRuntime(results);
ctx.cache.insertData('devicestatus', r, ageFilter);

const res = ctx.cache.getData('devicestatus');

const res2 = _.map(res, function eachStatus(result) {
//result.mills = new Date(result.created_at).getTime();
if ('uploaderBattery' in result) {
result.uploader = {
Expand All @@ -503,7 +491,8 @@ function loadDeviceStatus(ddata, env, ctx, callback) {
}
return result;
});
ddata.devicestatus = mergeProcessSort(ddata.devicestatus, r, ageFilter);

ddata.devicestatus = mergeProcessSort(ddata.devicestatus, res2, ageFilter);
} else {
ddata.devicestatus = [];
}
Expand Down
56 changes: 54 additions & 2 deletions lib/data/ddata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,59 @@ function init () {
, lastUpdated: 0
};

/**
* Convert Mongo ids to strings and ensure all objects have the mills property for
* significantly faster processing than constant date parsing, plus simplified
* logic
*/
ddata.processRawDataForRuntime = (data) => {

let obj = _.cloneDeep(data);

Object.keys(obj).forEach(key => {
if (typeof obj[key] === 'object' && obj[key]) {
if (obj[key].hasOwnProperty('_id')) {
obj[key]._id = obj[key]._id.toString();
}
if (obj[key].hasOwnProperty('created_at') && !obj[key].hasOwnProperty('mills')) {
obj[key].mills = new Date(obj[key].created_at).getTime();
}
if (obj[key].hasOwnProperty('sysTime') && !obj[key].hasOwnProperty('mills')) {
obj[key].mills = new Date(obj[key].sysTime).getTime();
}
}
});

return obj;
};

/**
* Merge two arrays based on _id string, preferring new objects when a collision is found
* @param {array} oldData
* @param {array} newData
*/
ddata.idMergePreferNew = (oldData, newData) => {

if (!newData && oldData) return oldData;
if (!oldData && newData) return newData;

const merged = _.cloneDeep(newData);

for (let i = 0; i < oldData.length; i++) {
const oldElement = oldData[i];
let found = false;
for (let j = 0; j < newData.length; j++) {
if (oldElement._id == newData[j]._id) {
found = true;
break;
}
}
if (!found) merged.push(oldElement); // Merge old object in, if it wasn't found in the new data
}

return merged;
};

ddata.clone = function clone () {
return _.clone(ddata, function(value) {
//special handling of mongo ObjectID's
Expand All @@ -34,7 +87,7 @@ function init () {
});
};

ddata.dataWithRecentStatuses = function dataWithRecentStatuses() {
ddata.dataWithRecentStatuses = function dataWithRecentStatuses () {
var results = {};
results.devicestatus = ddata.recentDeviceStatus(Date.now());
results.sgvs = ddata.sgvs;
Expand All @@ -55,7 +108,6 @@ function init () {
results.dbstats = ddata.dbstats;

return results;

}

ddata.recentDeviceStatus = function recentDeviceStatus (time) {
Expand Down
Loading