Merge branch 'dev' into new_cache_location

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
         mongodb-version: [4.2, 4.4]
 
     steps:

lib/api/entries/index.js

@@ -355,7 +355,7 @@ function configure (app, wares, ctx, env) {
       res.entries_err = err;
       return next();
     });
-  }, format_entries);
+  }, wares.obscure_device, format_entries);
 
   /**
    * @module get#/entries/:spec
@@ -389,7 +389,7 @@ function configure (app, wares, ctx, env) {
       prepReqModel(req, req.params.model);
       query_models(req, res, next);
     }
-  }, format_entries);
+  }, wares.obscure_device, format_entries);
 
   /**
    * @module get#/entries
@@ -400,7 +400,7 @@ function configure (app, wares, ctx, env) {
    * `find[date]`.
    *
    */
-  api.get('/entries', ifModifiedSinceCTX, query_models, format_entries);
+  api.get('/entries', ifModifiedSinceCTX, query_models, wares.obscure_device, format_entries);
 
   /**
    * @function echo_query
@@ -738,7 +738,7 @@ function configure (app, wares, ctx, env) {
         * @routed
         * @response 200 /definitions/Entries
         */
-  api.get('/times/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, query_models, format_entries);
+  api.get('/times/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, prep_patterns, query_models, wares.obscure_device, format_entries);
 
   api.get('/count/:storage/where', prep_storage, count_records, format_results);
 
@@ -753,7 +753,7 @@ function configure (app, wares, ctx, env) {
   /api/v1/slice/entries/dateString/mbg/2015.json
   ```
         */
-  api.get('/slice/:storage/:field/:type?/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, query_models, format_entries);
+  api.get('/slice/:storage/:field/:type?/:prefix?/:regex?', prep_storage, prep_pattern_field, prep_patterns, query_models, wares.obscure_device, format_entries);
 
   /**
    * @module post#/entries/preview
@@ -765,7 +765,7 @@ function configure (app, wares, ctx, env) {
     // setting this flag tells insert_entries to not actually store the results
     req.persist_entries = false;
     next();
-  }, insert_entries, format_entries);
+  }, insert_entries, wares.obscure_device, format_entries);
 
   // Protect endpoints with authenticated api.
   if (app.enabled('api')) {
@@ -780,7 +780,7 @@ function configure (app, wares, ctx, env) {
       // setting this flag tells insert_entries to store the results
       req.persist_entries = true;
       next();
-    }, insert_entries, format_entries);
+    }, insert_entries, wares.obscure_device, format_entries);
 
     /**
      * @module delete#/entries/:spec

lib/data/dataloader.js

@@ -190,6 +190,7 @@ function loadEntries(ddata, ctx, callback) {
         }
     };
 
+    var obscureDeviceProvenance = ctx.settings.obscureDeviceProvenance;
     ctx.entries.list(q, function(err, results) {
 
         if (err) {
@@ -213,15 +214,15 @@ function loadEntries(ddata, ctx, callback) {
                             _id: element._id,
                             mgdl: Number(element.mbg),
                             mills: element.date,
-                            device: element.device,
+                            device: obscureDeviceProvenance || element.device,
                             type: 'mbg'
                         });
                     } else if (element.sgv) {
                         sgvs.push({
                             _id: element._id,
                             mgdl: Number(element.sgv),
                             mills: element.date,
-                            device: element.device,
+                            device: obscureDeviceProvenance || element.device,
                             direction: element.direction,
                             filtered: element.filtered,
                             unfiltered: element.unfiltered,

lib/data/ddata.js

@@ -265,7 +265,11 @@ function init () {
     ddata.tempbasalTreatments = ddata.processDurations(tempbasalTreatments, false);
 
     // filter temp target
-    var tempTargetTreatments = ddata.treatments.filter(function filterTargets (t) {
+    var tempTargetTreatments = ddata.treatments.filter(function filterTargets (tt) {
+
+      // Clone the treatment before modifying it
+      let t = _.cloneDeep(tt);
+
       //check for a units being sent
       if (t.units) {
         if (t.units == 'mmol') {

lib/language.js

@@ -12,7 +12,8 @@ function init (fs) {
   language.lang = 'en';
 
   language.languages = [
-    { code: 'bg', file: 'bg_BG', language: 'Български', speechCode: 'bg-BG' }
+    { code: 'ar', file: 'ar_SA', language: 'اللغة العربية', speechCode: 'ar-SA' }
+    , { code: 'bg', file: 'bg_BG', language: 'Български', speechCode: 'bg-BG' }
     , { code: 'cs', file: 'cs_CZ', language: 'Čeština', speechCode: 'cs-CZ' }
     , { code: 'de', file: 'de_DE', language: 'Deutsch', speechCode: 'de-DE' }
     , { code: 'dk', file: 'da_DK', language: 'Dansk', speechCode: 'dk-DK' }

lib/middleware/index.js

@@ -3,7 +3,8 @@
 var wares = {
   sendJSONStatus : require('./send-json-status'),
   bodyParser : require('body-parser'),
-  compression : require('compression')
+  compression : require('compression'),
+  obscureDeviceProvenance: require('./obscure-provenance')
 };
 
 function extensions (list) {
@@ -26,7 +27,8 @@ function configure (env) {
       limit: '1Mb'
     }),
     compression: wares.compression,
-    extensions: extensions
+    extensions: extensions,
+    obscure_device: wares.obscureDeviceProvenance(env)
   };
 }
 

lib/middleware/obscure-provenance.js

@@ -0,0 +1,15 @@
+var _ = require('lodash');
+
+module.exports = function create_device_obscurity (env) {
+  function obscure_device (req, res, next) {
+    if (res.entries && env.settings.obscureDeviceProvenance) {
+      var entries = _.cloneDeep(res.entries);
+      for (var i = 0; i < entries.length; i++) {
+        entries[i].device = env.settings.obscureDeviceProvenance;
+      }
+      res.entries = entries;
+    }
+    next( );
+  }
+  return obscure_device;
+}

lib/plugins/loop.js

@@ -231,7 +231,7 @@ function init (ctx) {
         , split: false
         , targets: false
         , reasons: reasonconf
-        , otp: true 
+        , otp: true
         , submitHook: postLoopNotification
       },
       {
@@ -252,24 +252,24 @@ function init (ctx) {
       {
         val: 'Remote Carbs Entry'
         , name: 'Remote Carbs Entry'
-        , remoteCarbs: true 
-        , remoteAbsorption: true 
-        , otp: true 
+        , remoteCarbs: true
+        , remoteAbsorption: true
+        , otp: true
         , submitHook: postLoopNotification
       },
       {
         val: 'Remote Bolus Entry'
         , name: 'Remote Bolus Entry'
-        , remoteBolus: true 
-        , otp: true 
+        , remoteBolus: true
+        , otp: true
         , submitHook: postLoopNotification
       }
     ];
   };
 
   // TODO: Add event listener to customize labels
 
- 
+
   loop.updateVisualisation = function updateVisualisation (sbx) {
     var prop = sbx.properties.loop;
 
@@ -356,13 +356,21 @@ function init (ctx) {
 
     function addLastEnacted () {
       if (prop.lastEnacted) {
-        var canceled = prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0;
+        var valueParts = []
 
-        var valueParts = [
-          '<b>Temp Basal' + (canceled ? ' Canceled' : ' Started') + '</b>'
-          , canceled ? '' : ' ' + prop.lastEnacted.rate.toFixed(2) + 'U/hour for ' + prop.lastEnacted.duration + 'm'
-          , valueString(', ', prop.lastEnacted.reason)
-        ];
+        if (prop.lastEnacted.bolusVolume) {
+          valueParts.push('<b>Automatic Bolus</b>')
+          valueParts.push(' ' + prop.lastEnacted.bolusVolume + 'U')
+          if (prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0) {
+            valueParts.push(' (Temp Basal Canceled)')
+          }
+        } else if (prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0) {
+          valueParts.push('<b>Temp Basal Canceled</b>')
+        } else if (prop.lastEnacted.rate != null) {
+          valueParts.push('<b>Temp Basal Started</b>')
+          valueParts.push(' ' + prop.lastEnacted.rate.toFixed(2) + 'U/hour for ' + prop.lastEnacted.duration + 'm')
+        }
+        valueParts.push(valueString(', ', prop.lastEnacted.reason))
 
         valueParts = concatIOB(valueParts);
         valueParts = concatCOB(valueParts);

lib/plugins/pump.js

@@ -91,7 +91,7 @@ function init (ctx) {
     var prefs = pump.getPrefs(sbx);
 
     if (!prefs.enableAlerts) { return; }
-    
+
     pump.warnOnSuspend = prefs.warnOnSuspend;
 
     var data = prepareData(sbx.properties.pump, prefs, sbx);
@@ -130,7 +130,7 @@ function init (ctx) {
         }
       }
     });
-    
+
     if (result.extended) {
       info.push({label: '------------', value: ''});
       _.forOwn(result.extended, function(value, key) {
@@ -236,11 +236,7 @@ function init (ctx) {
   function updateReservoir (prefs, result) {
     if (result.reservoir) {
       result.reservoir.label = 'Reservoir';
-      if (result.reservoir_display_override) {
-        result.reservoir.display = result.reservoir_display_override;
-      } else {
-        result.reservoir.display = result.reservoir.value.toPrecision(3) + 'U';
-      }
+      result.reservoir.display = result.reservoir.value.toPrecision(3) + 'U';
       if (result.reservoir.value < prefs.urgentRes) {
         result.reservoir.level = levels.URGENT;
         result.reservoir.message = 'URGENT: Pump Reservoir Low';
@@ -250,11 +246,17 @@ function init (ctx) {
       } else {
         result.reservoir.level = levels.NONE;
       }
-    } else if (result.manufacturer === 'Insulet' &&  result.model === 'Eros') {
+    } else if (result.manufacturer === 'Insulet') {
       result.reservoir = {
         label: 'Reservoir', display: '50+ U'
       }
     }
+    if (result.reservoir_display_override) {
+      result.reservoir.display = result.reservoir_display_override;
+    }
+    if (result.reservoir_level_override) {
+      result.reservoir.level = result.reservoir_level_override;
+    }
   }
 
   function updateBattery (type, prefs, result, batteryWarn) {
@@ -319,6 +321,7 @@ function init (ctx) {
       , clock: pump.clock ? { value: moment(pump.clock) } : null
       , reservoir: pump.reservoir || pump.reservoir === 0 ? { value: pump.reservoir } : null
       , reservoir_display_override: pump.reservoir_display_override || null
+      , reservoir_level_override: pump.reservoir_level_override || null
       , manufacturer: pump.manufacturer
       , model: pump.model
       , extended: pump.extended || null

lib/sandbox.js

@@ -235,10 +235,9 @@ function init () {
   };
 
   sbx.displayBg = function displayBg (entry) {
-    var isDex = entry && (!entry.device || entry.device === 'dexcom' || entry.device === 'share2');
-    if (isDex && Number(entry.mgdl) === 39) {
+    if (Number(entry.mgdl) === 39) {
       return 'LOW';
-    } else if (isDex && Number(entry.mgdl) === 401) {
+    } else if (Number(entry.mgdl) === 401) {
       return 'HIGH';
     } else {
       return sbx.scaleEntry(entry);

lib/server/bootevent.js

@@ -35,7 +35,7 @@ function boot (env, language) {
 
     const isLTS = process.release.lts ? true : false;
 
-    if (isLTS && (semver.satisfies(nodeVersion, '^14.0.0') || semver.satisfies(nodeVersion, '^12.0.0') || semver.satisfies(nodeVersion, '^10.0.0'))) {
+    if (isLTS && (semver.satisfies(nodeVersion, '^16.0.0') || semver.satisfies(nodeVersion, '^14.0.0') || semver.satisfies(nodeVersion, '^12.0.0') || semver.satisfies(nodeVersion, '^10.0.0'))) {
       //Latest Node 10 LTS and Node 12 LTS are recommended and supported.
       //Require at least Node 8 LTS and Node 10 LTS without known security issues
       console.debug('Node LTS version ' + nodeVersion + ' is supported');

lib/server/loop.js

@@ -71,31 +71,34 @@ function init (env, ctx) {
         payload["override-duration-minutes"] = parseInt(data.duration);
       }
       alert = data.reasonDisplay + " Temporary Override";
-    } else if (data.eventType === 'Remote Carbs Entry') { 
+    } else if (data.eventType === 'Remote Carbs Entry') {
       payload["carbs-entry"] = parseFloat(data.remoteCarbs);
-      if(payload["carbs-entry"] > 0.0 ) { 
+      if(payload["carbs-entry"] > 0.0 ) {
          payload["absorption-time"] = 3.0;
          if (data.remoteAbsorption !== undefined && parseFloat(data.remoteAbsorption) > 0.0) {
            payload["absorption-time"] = parseFloat(data.remoteAbsorption);
          }
          if (data.otp !== undefined && data.otp.length > 0) {
             payload["otp"] = ""+data.otp
          }
+        if (data.created_at !== undefined) {
+          payload['start-time'] = data.created_at;
+        }
          alert  = "Remote Carbs Entry: "+payload["carbs-entry"]+" grams\n";
          alert += "Absorption Time: "+payload["absorption-time"]+" hours";
-      } else { 
+      } else {
          completion("Loop remote carbs failed. Incorrect carbs entry: ", data.remoteCarbs);
          return;
       }
-   
-   } else if (data.eventType === 'Remote Bolus Entry') { 
+
+   } else if (data.eventType === 'Remote Bolus Entry') {
       payload["bolus-entry"] = parseFloat(data.remoteBolus);
-      if(payload["bolus-entry"] > 0.0 ) { 
+      if(payload["bolus-entry"] > 0.0 ) {
          alert  = "Remote Bolus Entry: "+payload["bolus-entry"]+" U\n";
          if (data.otp !== undefined && data.otp.length > 0) {
             payload["otp"] = ""+data.otp
          }
-      } else { 
+      } else {
          completion("Loop remote bolus failed. Incorrect bolus entry: ", data.remoteBolus);
          return;
       }
@@ -112,11 +115,18 @@ function init (env, ctx) {
       alert += " - " + data.enteredBy
     }
 
+    // Track time notification was sent
+    let now = new Date()
+    payload['sent-at'] = now.toISOString();
+
+    // Expire after 5 minutes.
+    let expiration = new Date(now.getTime() + 5 * 60 * 1000)
+    payload['expiration'] = expiration.toISOString();
+
     let notification = new apn.Notification();
     notification.alert = alert;
     notification.topic = loopSettings.bundleIdentifier;
     notification.contentAvailable = 1;
-    notification.expiry =  Math.round((Date.now() / 1000)) + 60 * 5; // Allow this to enact within 5 minutes.
     notification.payload = payload;
 
     provider.send(notification, [loopSettings.deviceToken]).then( (response) => {

lib/server/websocket.js

@@ -219,7 +219,7 @@ function init (env, ctx, server) {
               ctx.store.collection(collection).findOne({ '_id': id }
                 , function(err, results) {
                   console.log('Got results', results);
-                  if (!err) {
+                  if (!err && results !== null) {
                     ctx.bus.emit('data-update', {
                       type: data.collection
                       , op: 'update'
@@ -266,7 +266,7 @@ function init (env, ctx, server) {
               ctx.store.collection(collection).findOne({ '_id': objId }
                 , function(err, results) {
                   console.log('Got results', results);
-                  if (!err) {
+                  if (!err && results !== null) {
                     ctx.bus.emit('data-update', {
                       type: data.collection
                       , op: 'update'
@@ -294,7 +294,7 @@ function init (env, ctx, server) {
       socket.on('dbAdd', function dbAdd (data, callback) {
         console.log(LOG_WS + 'dbAdd client ID: ', socket.client.id, ' data: ', data);
         var collection = supportedCollections[data.collection];
-        var maxtimediff = times.mins(1).msecs;
+        var maxtimediff = times.secs(2).msecs;
 
         var check = checkConditions('dbAdd', data);
         if (check) {