Bundled features for 0.11 that need to be tested and approved before being merged

.nvmrc

@@ -1 +1 @@
-8.12.x
+8.x

README.md

@@ -120,18 +120,18 @@ If you plan to use Nightscout, we recommend using [Heroku](http://openaps.readth
 
 Minimum browser requirements for viewing the site:
 
-- iOS 9
 - Android 4
-- Chrome 42
-- Safari 9 (El Capitan)
-- Firefox 34
+- Chrome 68
 - Edge 15
+- Firefox 61
 - Internet Explorer: not supported
-- Opera: not supported
+- iOS 9 
+- Safari 11
+- Opera: 54
 
 Windows installation software requirements:
 
-- [Node.js](http://nodejs.org/) Latest Node 8 LTS (Node 8.12.0 or later). Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`)
+- [Node.js](http://nodejs.org/) Latest Node 8 LTS (Node 8.15.0 or later) or Node 10 LTS (Node 10.15.0 or later; Node 10.14.1 works for Azure). Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`)
 - [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 3.x or later. MongoDB 2.4 is only supported for Raspberry Pi.
 
 As a non-root user clone this repo then install dependencies into the root of the project:
@@ -140,16 +140,15 @@ As a non-root user clone this repo then install dependencies into the root of th
 $ npm install
 ```
 
-Installation notes for Microsoft Azure, Windows and Node 10: 
+Installation notes for Microsoft Azure, Windows: 
 
 - If deploying the software to Microsoft Azure, you must set ** in the app settings for *WEBSITE_NODE_DEFAULT_VERSION* and *SCM_COMMAND_IDLE_TIMEOUT* **before** you deploy the latest Nightscout or the site deployment will likely fail. Other hosting environments do not require this setting. Please use:
 ```
-WEBSITE_NODE_DEFAULT_VERSION=8.11.1
+WEBSITE_NODE_DEFAULT_VERSION=10.14.1
 SCM_COMMAND_IDLE_TIMEOUT=300
 ```
 - See [install MongoDB, Node.js, and Nightscouton a single Windows system](https://github.com/jaylagorio/Nightscout-on-Windows-Server). if you want to host your Nightscout outside of the cloud. Although the instructions are intended for Windows Server the procedure is compatible with client versions of Windows such as Windows 7 and Windows 10.
 - If you deploy to Windows and want to develop or test you need to install [Cygwin](https://www.cygwin.com/) (use [setup-x86_64.exe](https://www.cygwin.com/setup-x86_64.exe) and make sure to install `build-essential` package. Test your configuration by executing `make` and check if all tests are ok. 
-- There may be some issues with Node 10.6.0 or later with Nightscout. Node 10 support will be in the 0.11 release. Please don't use Nightscout with (Node 9 or) Node 10 at this moment.
 
 # Usage
 
@@ -360,7 +359,11 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
   An option plugin to enable adding foods from database in Bolus Wizard and enable .
 
 ##### `rawbg` (Raw BG)
-  Calculates BG using sensor and calibration records from and displays an alternate BG values and noise levels.
+  Calculates BG using sensor and calibration records from and displays an alternate BG values and noise levels. Defaults that can be adjusted with [extended setting](#extended-settings)
+  * `DISPLAY` (`unsmoothed`) - Allows the user to control which algorithm is used to calculate the displayed raw BG values using the most recent calibration record.
+    * `unfiltered` - Raw BG is calculated by applying the calibration to the glucose record's unfiltered value.
+    * `filtered` - Raw BG is calculated by applying the calibration to the glucose record's filtered value. The glucose record's filtered values are generally produced by the CGM by a running average of the unfiltered values to produce a smoothed value when the sensor noise is high.
+    * `unsmoothed` - Raw BG is calculated by first finding the ratio of the calculated filtered value (the same value calculated by the `filtered` setting) to the reported glucose value. The displayed raw BG value is calculated by dividing the calculated unfiltered value (the same value calculated by the `unfiltered` setting) by the ratio.  The effect is to exagerate changes in trend direction so the trend changes are more noticeable to the user. This is the legacy raw BG calculation algorithm.
 
 ##### `iob` (Insulin-on-Board)
   Adds the IOB pill visualization in the client and calculates values that used by other plugins.  Uses treatments with insulin doses and the `dia` and `sens` fields from the [treatment profile](#treatment-profile).

app.js

@@ -173,7 +173,8 @@ function create(env, ctx) {
     // serve the static content
     app.use(staticFiles);
 
-    var swaggerFiles = express.static(env.swagger_files, {
+    const swaggerUiAssetPath = require("swagger-ui-dist").getAbsoluteFSPath();
+    var swaggerFiles = express.static(swaggerUiAssetPath, {
         maxAge: maxAge
     });
 

env.js

@@ -25,7 +25,6 @@ function config ( ) {
   env.HOSTNAME = readENV('HOSTNAME', null);
   env.IMPORT_CONFIG = readENV('IMPORT_CONFIG', null);
   env.static_files = readENV('NIGHTSCOUT_STATIC_FILES', __dirname + '/static/');
-  env.swagger_files = readENV('NIGHTSCOUT_SWAGGER_FILES',  __dirname + '/node_modules/swagger-ui-dist/');
   env.debug = {
     minify: readENVTruthy('DEBUG_MINIFY', true)
   };

lib/admin_plugins/cleanentriesdb.js

@@ -0,0 +1,80 @@
+'use strict';
+
+var moment = require('moment');
+
+var cleanentriesdb = {
+  name: 'cleanentriesdb'
+  , label: 'Clean Mongo entries (glucose entries) database'
+  , pluginType: 'admin'
+};
+
+function init() {
+  return cleanentriesdb;
+}
+
+module.exports = init;
+
+cleanentriesdb.actions = [
+    {
+        name: 'Delete all documents from entries collection older than 180 days'
+      , description: 'This task removes all documents from entries collection that are older than 180 days. Useful when uploader battery status is not properly updated.'
+      , buttonLabel: 'Delete old documents'
+      , confirmText: 'Delete old documents from entries collection?'
+      , preventClose: true
+    }
+  ];
+
+cleanentriesdb.actions[0].init = function init(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleanentriesdb.name + '_0_status');
+
+  $status.hide();
+
+  var numDays =  '<br/>'
+      + '<label for="admin_entries_days">'
+      + translate('Number of Days to Keep:')
+      + '  <input id="admin_entries_days" value="180" size="3" min="1"/>'
+      + '</label>';
+
+  $('#admin_' + cleanentriesdb.name + '_0_html').html(numDays);
+
+  if (callback) { callback(); }
+};
+
+cleanentriesdb.actions[0].code =  function deleteOldRecords(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleanentriesdb.name + '_0_status');
+  var numDays = Number($('#admin_entries_days').val());
+
+  if (isNaN(numDays) || (numDays < 3)) {
+    alert(translate('%1 is not a valid number - must be more than 2', { params: [$('#admin_entries_days').val()] }));
+    if (callback) { callback(); }
+    return;
+  }
+  var endDate = moment().subtract(numDays, 'days');
+
+  if (!client.hashauth.isAuthenticated()) {
+    alert(translate('Your device is not authenticated yet'));
+    if (callback) {
+      callback();
+    }
+    return;
+  }
+
+  $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
+  $.ajax('/api/v1/entries/?find[date][$lte]=' + endDate.valueOf(), {
+      method: 'DELETE'
+    , headers: client.headers()
+    , success: function (retVal) {
+      $status.hide().text(translate('%1 records deleted',{ params: [retVal.n] })).fadeIn('slow');
+    }
+    , error: function () {
+      $status.hide().text(translate('Error')).fadeIn('slow');
+    }
+  }).done(function success () {
+    if (callback) { callback(); }
+  }).fail(function fail() {
+    if (callback) { callback(); }
+  });
+
+};

lib/admin_plugins/cleanstatusdb.js

@@ -116,18 +116,18 @@ cleanstatusdb.actions[1].code =  function deleteOldRecords(client, callback) {
   }
 
   $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
-  $.ajax({
+  $.ajax('/api/v1/devicestatus/?find[created_at][$lte]=' + dateStr, {
       method: 'DELETE'
-    , url: '/api/v1/devicestatus/?find[created_at][$lte]=' + dateStr
     , headers: client.headers()
     , success: function (retVal) {
-      $status.hide().text(translate('%1 records deleted',{ params: [retVal.n] })).fadeIn('slow');
+      $status.text(translate('%1 records deleted',{ params: [retVal.n] }));
+    }
+    , error: function () {
+      $status.hide().text(translate('Error')).fadeIn('slow');
     }
   }).done(function success () {
     if (callback) { callback(); }
   }).fail(function fail() {
-    $status.hide().text(translate('Error')).fadeIn('slow');
     if (callback) { callback(); }
   });
-
 };

lib/admin_plugins/cleantreatmentsdb.js

@@ -0,0 +1,81 @@
+'use strict';
+
+var moment = require('moment');
+
+var cleantreatmentsdb = {
+  name: 'cleantreatmentsdb'
+  , label: 'Clean Mongo treatments database'
+  , pluginType: 'admin'
+};
+
+function init() {
+  return cleantreatmentsdb;
+}
+
+module.exports = init;
+
+cleantreatmentsdb.actions = [
+    {
+        name: 'Delete all documents from treatments collection older than 180 days'
+      , description: 'This task removes all documents from treatments collection that are older than 180 days. Useful when uploader battery status is not properly updated.'
+      , buttonLabel: 'Delete old documents'
+      , confirmText: 'Delete old documents from treatments collection?'
+      , preventClose: true
+    }
+  ];
+
+cleantreatmentsdb.actions[0].init = function init(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleantreatmentsdb.name + '_0_status');
+
+  $status.hide();
+
+  var numDays =  '<br/>'
+      + '<label for="admin_treatments_days">'
+      + translate('Number of Days to Keep:')
+      + '  <input id="admin_treatments_days" value="180" size="3" min="1"/>'
+      + '</label>';
+
+  $('#admin_' + cleantreatmentsdb.name + '_0_html').html(numDays);
+
+  if (callback) { callback(); }
+};
+
+cleantreatmentsdb.actions[0].code =  function deleteOldRecords(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleantreatmentsdb.name + '_0_status');
+  var numDays = Number($('#admin_treatments_days').val());
+
+  if (isNaN(numDays) || (numDays < 3)) {
+    alert(translate('%1 is not a valid number - must be more than 2', { params: [$('#admin_treatments_days').val()] }));
+    if (callback) { callback(); }
+    return;
+  }
+  var endDate = moment().subtract(numDays, 'days');
+  var dateStr = endDate.format('YYYY-MM-DD');
+
+  if (!client.hashauth.isAuthenticated()) {
+    alert(translate('Your device is not authenticated yet'));
+    if (callback) {
+      callback();
+    }
+    return;
+  }
+
+  $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
+  $.ajax('/api/v1/treatments/?find[created_at][$lte]=' + dateStr, {
+      method: 'DELETE'
+    , headers: client.headers()
+    , success: function (retVal) {
+      $status.hide().text(translate('%1 records deleted',{ params: [retVal.n] })).fadeIn('slow');
+    }
+    , error: function () {
+      $status.hide().text(translate('Error')).fadeIn('slow');
+    }
+  }).done(function success () {
+    if (callback) { callback(); }
+  }).fail(function fail() {
+    if (callback) { callback(); }
+  });
+
+};

lib/admin_plugins/index.js

@@ -8,6 +8,8 @@ function init() {
         require('./subjects')()
       , require('./roles')()
       , require('./cleanstatusdb')()
+      , require('./cleantreatmentsdb')()
+      , require('./cleanentriesdb')()
       , require('./futureitems')()
     ];
 
@@ -84,4 +86,4 @@ function init() {
 
 }
 
-module.exports = init;
+module.exports = init;

lib/api/devicestatus/index.js

@@ -43,37 +43,52 @@ function configure (app, wares, ctx) {
 
     api.post('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:create'), doPost);
 
-    api.delete('/devicestatus/:_id', ctx.authorization.isPermitted('api:devicestatus:delete'), function(req, res) {
-      console.log('Deleting id: ' + req.params._id);
-
-      ctx.devicestatus.remove_id(req.params._id, function (err, removed) {
-        if (err) {
-          res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err);
-        } else {
-          res.json(removed);
-        }
-      });
-    });
-
-    // delete record that match query
-    api.delete('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:delete'), function(req, res) {
+    /**
+     * @function delete_records
+     * Delete devicestatus.  The query logic works the same way as find/list.  This
+     * endpoint uses same search logic to remove records from the database.
+     */
+    function delete_records(req, res, next) {
       var query = req.query;
+      if (!query.count) {
+        query.count = 10
+      }
 
       console.log('Delete records with query: ', query);
 
       // remove using the query
       ctx.devicestatus.remove(query, function(err, stat) {
         if (err) {
-          res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err);
-          console.log('Error saving treatment');
-          console.log(err);
-        } else {
-          res.json(stat);
-          console.log('devicestatus records deleted');
+          console.log('devicestatus delete error: ', err);
+          return next(err);
         }
+        // yield some information about success of operation
+        res.json(stat);
+
+        console.log('devicestatus records deleted');
+
+        return next();
       });
-    });
+    }
 
+    api.delete('/devicestatus/:id', ctx.authorization.isPermitted('api:devicestatus:delete'), function(req, res, next) {
+      if (!req.query.find) {
+        req.query.find = {
+          _id: req.params.id
+        };
+      } else {
+        req.query.find._id = req.params.id;
+      }
+
+      if (req.query.find._id === '*') {
+        // match any record id
+        delete req.query.find._id;
+      }
+      next();
+    }, delete_records);
+
+    // delete record that match query
+    api.delete('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:delete'), delete_records);
   }
 
   if (app.enabled('api') || true /*TODO: auth disabled for quick UI testing...*/) {

lib/api/entries/index.js

@@ -743,11 +743,12 @@ curl -s -g 'http://localhost:1337/api/v1/times/20{14..15}/T{13..18}:{00..15}'.js
       next();
     }, delete_records);
 
-
+    // delete record that match query
+    api.delete('/entries/', ctx.authorization.isPermitted('api:entries:delete'), delete_records);
   }
 
   return api;
 }
 
 // expose module
-module.exports = configure;
+module.exports = configure;