nightscout Dev

.browserslistrc

@@ -0,0 +1,12 @@
+# Browsers we support
+# See https://github.com/browserslist/browserslist for details
+
+> 0.25%
+ios_saf 9.3
+ios_saf 10.3
+ios_saf 13.7
+ios_saf 14.8
+not dead
+not and_uc 12.12
+not ie 11
+

.github/workflows/codeql-analysis.yml

@@ -37,11 +37,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/main.yml

@@ -16,15 +16,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
-        mongodb-version: [4.2, 4.4]
+        node-version: [14.x, 16.x]
+        mongodb-version: [4.4, 5.0, 6.0]
 
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -60,7 +60,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASS }}
       - name: Clean git Checkout
         if: success()
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Build, tag and push the dev Docker image
         if: success() && github.ref == 'refs/heads/dev'
         uses: docker/build-push-action@v2

.nvmrc

@@ -1 +1 @@
-14.15.3
+16.16.0

README.md

@@ -1,5 +1,5 @@
 Nightscout Web Monitor (a.k.a. cgm-remote-monitor)
-======================================
+==================================================
 
 ![nightscout horizontal](https://cloud.githubusercontent.com/assets/751143/8425633/93c94dc0-1ebc-11e5-99e7-71a8f464caac.png)
 
@@ -9,8 +9,6 @@ Nightscout Web Monitor (a.k.a. cgm-remote-monitor)
 [![Codacy Badge][codacy-img]][codacy-url]
 [![Discord chat][discord-img]][discord-url]
 
-[![Deploy to Heroku][heroku-img]][heroku-url] [![Update your site][update-img]][update-fork]
-
 This acts as a web-based CGM (Continuous Glucose Monitor) to allow
 multiple caregivers to remotely view a patient's glucose data in
 real time.  The server reads a MongoDB which is intended to be data
@@ -132,40 +130,38 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Supported configurations:
 
-If you plan to use Nightscout, we recommend using [Heroku](https://nightscout.github.io/nightscout/new_user/) as this is free and easy to use.
-We used to recommend hostig at Azure, but the resource needs of Nightscout have grown over the years and Azure won't comfortably run Nightscout
-anymore in the free tier. If you're hosting in Azure and looking to update your site, we recommend you
-[switch from Azure to Heroku](http://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/nightscout-setup.html#switching-from-azure-to-heroku)
-as you're likely to hit issues in the process of updating the site.
-
-- [Nightscout Setup with Heroku](https://nightscout.github.io/nightscout/new_user/) (recommended)
+- [Nightscout Setup](https://nightscout.github.io/nightscout/new_user/) (recommended)
 
 While you can install Nightscout on a virtual server or a Raspberry Pi, we do not recommend this unless you have at least some
-experience hosting Node applications and development using the toolchain in use with Nightscout. Heroku automates all of the
-hosting for you and even many of the dvelopers run their production sites in Heroku due to convenience.
+experience hosting Node applications and development using the toolchain in use with Nightscout.
 
-If you're a hosting provider and want to provide our users additional free hosting options,
+If you're a hosting provider and want to provide our users additional hosting options,
 you're welcome to issue a documentation pull request with instructions on how to setup Nightscout on your system.
 
 ## Recommended minimum browser versions for using Nightscout:
 
-Older versions of the browsers might work, but are untested.
+Our [browserslist](https://github.com/browserslist/browserslist) policy is documented in `.browserlistrc`.   
+We currently support approximately [91%](https://browsersl.ist/?q=%3E+0.25%25%2C+ios_saf+9.3%2C+ios_saf+10.3%2C+ios_saf+13.7%2C+ios_saf+14.8%2C+not+dead%2C+not+and_uc+12.12%2C+not+ie+11%0A) of all browsers globally used. These include:
+
+- Android Chrome: 104 or later (`and_chr`)
+- Google Chrome: 101 or later (`chrome`)
+- Microsoft Edge: 103 or later (`edge`)
+- Mozilla Firefox: 102 or later (`firefox`)
+- Apple Safari on iOS: 15.5 or later (`ios_saf`)
+- Opera Mini on Android: 63 or later (`op_mini`)
+- Opera: 88 or later (`opera`)
+- Apple Safari for macOS 10.15 Catalina or later: : 15.5 or later (`safari`)
+- Samsung Internet on Android: 17.0 or later (`samsung`)
+- Internet Explorer 11 : not supported
 
-- Android 4
-- iOS 6
-- Chrome 35
-- Edge 17
-- Firefox 61
-- Opera 12.1
-- Safari 6 (macOS 10.7)
-- Internet Explorer: not supported
+Older versions or other browsers might work, but are untested and unsupported. We'll try to to keep Nightscout compatible with older iPads (e.g. Safari on iOS 10.3.4), but note that those devices are not supported by Apple anymore and have known security issues. Debugging these old devices gets harder due to Apple not supporting debugging the old devices on Macs that have been updated. Some features may not work with devices/browsers on the older end of these requirements.
 
-Some features may not work with devices/browsers on the older end of these requirements.
 
-## Windows installation software requirements:
 
-- [Node.js](http://nodejs.org/) Latest Node 12 LTS. Node versions that do not have the latest security patches will not work. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `bin/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.
+## Installation software requirements:
+
+- [Node.js](http://nodejs.org/) Latest Node v14 or v16 LTS. Node versions that do not have the latest security patches will not be supported. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `bin/setup.sh`)
+- [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 4.2 or 4.4.
 
 As a non-root user clone this repo then install dependencies into the root of the project:
 
@@ -184,7 +180,7 @@ $ npm install
 
 - 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. Additionally, if using the Azure free hosting tier, the installation might fail due to resource constraints imposed by Azure on the free hosting. Please set the following settings to the environment in Azure:
 ```
-WEBSITE_NODE_DEFAULT_VERSION=10.15.2
+WEBSITE_NODE_DEFAULT_VERSION=16.16.0
 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.
@@ -256,6 +252,14 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs/ or
   * `IMPORT_CONFIG` - Used to import settings and extended settings from a url such as a gist.  Structure of file should be something like: `{"settings": {"theme": "colors"}, "extendedSettings": {"upbat": {"enableAlerts": true}}}`
   * `TREATMENTS_AUTH` (`on`) - possible values `on` or `off`. Deprecated, if set to `off` the `careportal` role will be added to `AUTH_DEFAULT_ROLES`
 
+#### Data Rights
+
+These are useful to help protect your rights to portability and
+autonomy for your data:
+  * `OBSCURED` - list, identical to `ENABLE`, a list of plugins to
+    obscure.
+  * `OBSCURE_DEVICE_PROVENANCE` - Required, a string visible to the [companies deciding to filter based on your data](https://help.sugarmate.io/en/articles/4673402-adding-a-nightscout-data-source).  For example, `my-data-rights`.
+
 ### Alarms
 
   These alarm setting affect all delivery methods (browser, Pushover, IFTTT, etc.). Values and settings entered here will be the defaults for new browser views, but will be overridden if different choices are made in the settings UI.

app.json

@@ -151,6 +151,11 @@
       "description": "Default setting for new browser views, for the time mode. ('12' or '24')",
       "value": "12",
       "required": false 
+    },
+    "USE_NPM_INSTALL": {
+      "description": "You need to have this set for deployment to work in Heroku",
+      "value": "true",
+      "required": true 
     }
   },
   "addons": [

azuredeploy.json

@@ -218,7 +218,7 @@
     },
     "WEBSITE_NODE_DEFAULT_VERSION": {
         "type": "string",
-        "defaultValue": "8.11.1"
+        "defaultValue": "16.16.0"
     }
   },
   "resources": [{

bundle/bundle.source.js

@@ -18,14 +18,20 @@ require('../node_modules/flot/jquery.flot.time');
 require('../node_modules/flot/jquery.flot.pie');
 require('../node_modules/flot/jquery.flot.fillbetween');
 
-window.moment = require('moment-timezone');
+const moment = require('moment-timezone');
+
+window.moment = moment;
 
 window.Nightscout = window.Nightscout || {};
 
+var ctx = {
+    moment: moment
+};
+
 window.Nightscout = {
     client: require('../lib/client'),
     units: require('../lib/units')(),
-    admin_plugins: require('../lib/admin_plugins/')()
+    admin_plugins: require('../lib/admin_plugins/')(ctx)
 };
 
 window.Nightscout.report_plugins_preinit = require('../lib/report_plugins/');

docker-compose.yml

@@ -1,10 +1,18 @@
 version: '3'
 
+x-logging:
+  &default-logging
+  options:
+    max-size: '10m'
+    max-file: '5'
+  driver: json-file
+
 services:
   mongo:
     image: mongo:4.4
     volumes:
       - ${NS_MONGO_DATA_DIR:-./mongo-data}:/data/db:cached
+    logging: *default-logging
 
   nightscout:
     image: nightscout/cgm-remote-monitor:latest
@@ -19,6 +27,7 @@ services:
       - 'traefik.http.routers.nightscout.rule=Host(`localhost`)'
       - 'traefik.http.routers.nightscout.entrypoints=websecure'
       - 'traefik.http.routers.nightscout.tls.certresolver=le'
+    logging: *default-logging
     environment:
       ### Variables for the container
       NODE_ENV: production
@@ -74,3 +83,4 @@ services:
     volumes:
       - './letsencrypt:/letsencrypt'
       - '/var/run/docker.sock:/var/run/docker.sock:ro'
+    logging: *default-logging

lib/admin_plugins/cleanentriesdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleanentriesdb = {
   name: 'cleanentriesdb'
   , label: 'Clean Mongo entries (glucose entries) database'
   , pluginType: 'admin'
 };
 
-function init() {
+function init(ctx) {
+  moment = ctx.moment;
   return cleanentriesdb;
 }
 

lib/admin_plugins/cleanstatusdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleanstatusdb = {
   name: 'cleanstatusdb'
   , label: 'Clean Mongo status database'
   , pluginType: 'admin'
 };
 
-function init () {
+function init (ctx) {
+  moment = ctx.moment;
   return cleanstatusdb;
 }
 

lib/admin_plugins/cleantreatmentsdb.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var moment = require('moment');
+var moment;
 
 var cleantreatmentsdb = {
   name: 'cleantreatmentsdb'
   , label: 'Clean Mongo treatments database'
   , pluginType: 'admin'
 };
 
-function init() {
+function init(ctx) {
+  moment = ctx.moment;
   return cleantreatmentsdb;
 }
 

lib/admin_plugins/index.js

@@ -3,14 +3,14 @@
 var _find = require('lodash/find');
 var _each = require('lodash/each');
 
-function init() {
+function init(ctx) {
     var allPlugins = [
-        require('./subjects')()
-      , require('./roles')()
-      , require('./cleanstatusdb')()
-      , require('./cleantreatmentsdb')()
-      , require('./cleanentriesdb')()
-      , require('./futureitems')()
+        require('./subjects')(ctx)
+      , require('./roles')(ctx)
+      , require('./cleanstatusdb')(ctx)
+      , require('./cleantreatmentsdb')(ctx)
+      , require('./cleanentriesdb')(ctx)
+      , require('./futureitems')(ctx)
     ];
 
   function plugins(name) {

lib/api/alexa/index.js

@@ -94,7 +94,7 @@ function configure (app, wares, ctx, env) {
 
     var handler = ctx.alexa.getIntentHandler(intentName, metric);
     if (handler){
-      var sbx = initializeSandbox();
+      var sbx = ctx.sbx;
       handler(next, slots, sbx);
       return;
     } else {
@@ -103,13 +103,6 @@ function configure (app, wares, ctx, env) {
     }
   }
 
-  function initializeSandbox() {
-    var sbx = require('../../sandbox')();
-    sbx.serverInit(env, ctx);
-    ctx.plugins.setProperties(sbx);
-    return sbx;
-  }
-
   return api;
 }
 

lib/api/entries/index.js

@@ -472,14 +472,16 @@ function configure (app, wares, ctx, env) {
       });
     } else {
       inMemoryCollection = ctx.cache.getData('entries');
-
-      inMemoryCollection = _.sortBy(inMemoryCollection, function(item) {
-        return item.mills;
-      }).reverse();
     }
 
     if (inMemoryPossible && query.count <= inMemoryCollection.length) {
       res.entries = _.cloneDeep(_.take(inMemoryCollection,query.count));
+
+      for (let i = 0; i < res.entries.length; i++) {
+        let e = res.entries[i];
+        e.mills = e.mills || e.date;
+      }
+
       res.entries_err = null;
       return next();
     }

lib/api/googlehome/index.js

@@ -31,7 +31,7 @@ function configure (app, wares, ctx, env) {
 
     var handler = ctx.googleHome.getIntentHandler(req.body.queryResult.intent.displayName, req.body.queryResult.parameters.metric);
     if (handler){
-      var sbx = initializeSandbox();
+      var sbx = ctx.sbx;
       handler(function (title, response) {
         res.json(ctx.googleHome.buildSpeechletResponse(response, false));
         next( );
@@ -46,13 +46,6 @@ function configure (app, wares, ctx, env) {
 
   ctx.virtAsstBase.setupMutualIntents(ctx.googleHome);
 
-  function initializeSandbox() {
-    var sbx = require('../../sandbox')();
-    sbx.serverInit(env, ctx);
-    ctx.plugins.setProperties(sbx);
-    return sbx;
-  }
-
   return api;
 }