Syncing recent dev

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: CI test
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -28,5 +28,7 @@ jobs:
         sudo apt-get install -y --allow-downgrades mongodb-org=3.6.14 mongodb-org-server=3.6.14 mongodb-org-shell=3.6.14 mongodb-org-mongos=3.6.14 mongodb-org-tools=3.6.14
     - name: Start MongoDB
       run: sudo systemctl start mongod
-    - name: Run tests
+    - name: Run Tests
       run: npm run-script test-ci
+    - name: Send Coverage
+      run: npm run-script coverage

CONTRIBUTING.md

@@ -34,7 +34,7 @@
 [coverage-img]: https://img.shields.io/coveralls/nightscout/cgm-remote-monitor/master.svg
 [coverage-url]: https://coveralls.io/r/nightscout/cgm-remote-monitor?branch=master
 [discord-img]: https://img.shields.io/discord/629952586895851530?label=discord%20chat
-[discord-url]: https://discordapp.com/channels/629952586895851530/629952669967974410
+[discord-url]: https://discord.gg/rTKhrqz
 
 ## Installation for development
 
@@ -181,6 +181,7 @@ Also if you can't code, it's possible to contribute by improving the documentati
 [@unsoluble]: https://github.com/unsoluble
 [@viderehh]: https://github.com/viderehh
 [@OpossumGit]: https://github.com/OpossumGit
+[@Bartlomiejsz]: https://github.com/Bartlomiejsz
 
 | Contribution area                     | List of contributors |
 | ------------------------------------- | ---------------------------------- |
@@ -252,7 +253,7 @@ Languages with less than 90% coverage will be removed in a future Nightscout ver
 | 한국어 (`ko`)|Please volunteer|Needs attention: 80.6%|
 | Norsk (Bokmål) (`nb`)|Please volunteer|OK|
 | Nederlands (`nl`)|[@PieterGit]|OK|
-| Polski (`pl`)|Please volunteer|OK|
+| Polski (`pl`)|[@Bartlomiejsz]|OK|
 | Português (Brasil) (`pt`)|Please volunteer|OK|
 | Română (`ro`)|Please volunteer|OK|
 | Русский (`ru`)|[@apanasef]|OK|

README.md

@@ -49,23 +49,24 @@ Community maintained fork of the
 
 - [Install](#install)
   - [Supported configurations:](#supported-configurations)
-  - [Minimum browser requirements for viewing the site:](#minimum-browser-requirements-for-viewing-the-site)
+  - [Recommended minimum browser versions for using Nightscout:](#recommended-minimum-browser-versions-for-using-nightscout)
   - [Windows installation software requirements:](#windows-installation-software-requirements)
   - [Installation notes for users with nginx or Apache reverse proxy for SSL/TLS offloading:](#installation-notes-for-users-with-nginx-or-apache-reverse-proxy-for-ssltls-offloading)
   - [Installation notes for Microsoft Azure, Windows:](#installation-notes-for-microsoft-azure-windows)
+- [Development](#development)
 - [Usage](#usage)
   - [Updating my version?](#updating-my-version)
-  - [What is my mongo string?](#what-is-my-mongo-string)
   - [Configure my uploader to match](#configure-my-uploader-to-match)
   - [Nightscout API](#nightscout-api)
       - [Example Queries](#example-queries)
   - [Environment](#environment)
     - [Required](#required)
-    - [Features/Labs](#featureslabs)
+    - [Features](#features)
     - [Alarms](#alarms)
     - [Core](#core)
     - [Predefined values for your browser settings (optional)](#predefined-values-for-your-browser-settings-optional)
     - [Predefined values for your server settings (optional)](#predefined-values-for-your-server-settings-optional)
+    - [Views](#views)
     - [Plugins](#plugins)
       - [Default Plugins](#default-plugins)
         - [`delta` (BG Delta)](#delta-bg-delta)
@@ -97,7 +98,7 @@ Community maintained fork of the
         - [`openaps` (OpenAPS)](#openaps-openaps)
         - [`loop` (Loop)](#loop-loop)
         - [`override` (Override Mode)](#override-override-mode)
-        - [`xdripjs` (xDrip-js)](#xdripjs-xdripjs)
+        - [`xdripjs` (xDrip-js)](#xdripjs-xdrip-js)
         - [`alexa` (Amazon Alexa)](#alexa-amazon-alexa)
         - [`googlehome` (Google Home/DialogFLow)](#googlehome-google-homedialogflow)
         - [`speech` (Speech)](#speech-speech)
@@ -109,6 +110,7 @@ Community maintained fork of the
   - [Setting environment variables](#setting-environment-variables)
     - [Vagrant install](#vagrant-install)
   - [More questions?](#more-questions)
+    - [Browser testing suite provided by](#browser-testing-suite-provided-by)
   - [License](#license)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -583,7 +585,7 @@ For remote overrides, the following extended settings must be configured:
   Treatment Profile Fields:
 
   * `timezone` (Time Zone) - time zone local to the patient. *Should be set.*
-  * `units` (Profile Units) - blood glucose units used in the profile, either "mgdl" or "mmol"
+  * `units` (Profile Units) - blood glucose units used in the profile, either "mg/dl" or "mmol"
   * `dia` (Insulin duration) - value should be the duration of insulin action to use in calculating how much insulin is left active. Defaults to 3 hours.
   * `carbs_hr` (Carbs per Hour) - The number of carbs that are processed per hour, for more information see [#DIYPS](http://diyps.org/2014/05/29/determining-your-carbohydrate-absorption-rate-diyps-lessons-learned/).
   * `carbratio` (Carb Ratio) - grams per unit of insulin.

app.js

@@ -131,36 +131,53 @@ function create (env, ctx) {
     }
   }));
 
-  const clockviews = require('./lib/server/clocks.js')(env, ctx);
-  clockviews.setLocals(app.locals);
-
-  app.use("/clock", clockviews);
-
-  app.get("/", (req, res) => {
-    res.render("index.html", {
-      locals: app.locals
-    });
-  });
-
   var appPages = {
-    "/clock-color.html": "clock-color.html"
-    , "/admin": "adminindex.html"
-    , "/profile": "profileindex.html"
-    , "/food": "foodindex.html"
-    , "/bgclock.html": "bgclock.html"
-    , "/report": "reportindex.html"
-    , "/translations": "translationsindex.html"
-    , "/clock.html": "clock.html"
+    "/": {
+      file: "index.html"
+      , type: "index"
+    }
+    , "/admin": {
+      file: "adminindex.html"
+      , title: 'Admin Tools'
+      , type: 'admin'
+    }
+    , "/food": {
+      file: "foodindex.html"
+      , title: 'Food Editor'
+      , type: 'food'
+    }
+    , "/profile": {
+      file: "profileindex.html"
+      , title: 'Profile Editor'
+      , type: 'profile'
+    }
+    , "/report": {
+      file: "reportindex.html"
+      , title: 'Nightscout reporting'
+      , type: 'report'
+    }
+    , "/translations": {
+      file: "translationsindex.html"
+      , title: 'Nightscout translations'
+      , type: 'translations'
+    }
   };
 
   Object.keys(appPages).forEach(function(page) {
     app.get(page, (req, res) => {
-      res.render(appPages[page], {
-        locals: app.locals
+      res.render(appPages[page].file, {
+        locals: app.locals,
+        title: appPages[page].title ? appPages[page].title : '',
+        type: appPages[page].type ? appPages[page].type : '',
       });
     });
   });
 
+  const clockviews = require('./lib/server/clocks.js')(env, ctx);
+  clockviews.setLocals(app.locals);
+
+  app.use("/clock", clockviews);
+
   app.get("/appcache/*", (req, res) => {
     res.render("nightscout.appcache", {
       locals: app.locals

bundle/bundle.reports.source.js

@@ -1,10 +1,11 @@
 import './bundle.source';
 
 window.Nightscout.report_plugins = require('../lib/report_plugins/')();
+window.Nightscout.predictions = require('../lib/report/predictions');
 
 console.info('Nightscout report bundle ready');
 
 // Needed for Hot Module Replacement
 if(typeof(module.hot) !== 'undefined') {
-    module.hot.accept() // eslint-disable-line no-undef  
+    module.hot.accept()
   }

bundle/bundle.source.js

@@ -32,5 +32,5 @@ console.info('Nightscout bundle ready');
 
 // Needed for Hot Module Replacement
 if(typeof(module.hot) !== 'undefined') {
-    module.hot.accept() // eslint-disable-line no-undef  
+    module.hot.accept()
   }

ci.test.env

@@ -4,4 +4,5 @@ HOSTNAME=localhost
 INSECURE_USE_HTTP=true
 PORT=1337
 NODE_ENV=production
-CI=true
+CI=true
+CODACY_PROJECT_TOKEN=cff7ab3377d6434a9355fd051dbb4595

docs/plugins/alexa-plugin.md

@@ -10,6 +10,7 @@
     - [Create a new Alexa skill](#create-a-new-alexa-skill)
     - [Define the interaction model](#define-the-interaction-model)
     - [Point your skill at your site](#point-your-skill-at-your-site)
+    - [Do you use Authentication Roles?](#do-you-use-authentication-roles)
     - [Test your skill out with the test tool](#test-your-skill-out-with-the-test-tool)
         - [What questions can you ask it?](#what-questions-can-you-ask-it)
     - [Activate the skill on your Echo or other device](#activate-the-skill-on-your-echo-or-other-device)
@@ -75,10 +76,20 @@ Now you need to point your skill at *your* Nightscout site.
 1. In the left-hand menu for your skill, there's an option called "Endpoint". Click it.
 1. Under "Service Endpoint Type", select "HTTPS".
 1. You only need to set up the Default Region. In the box that says "Enter URI...", put in `https://{yourdomain}/api/v1/alexa`. (So if your Nightscout site is at `mynightscoutsite.herokuapp.com`, you'll enter `https://mynightscoutsite.herokuapp.com/api/v1/alexa` in the box.)
+    - If you use Authentication Roles, you'll need to add a bit to the end of your URL. See [the section](#do-you-use-authentication-roles) below.
 1. In the dropdown under the previous box, select "My development endpoint is a sub-domain of a domain that has a wildcard certificate from a certificate authority". 
 1. Click the "Save Endpoints" button at the top.
 1. You should see a success message pop up when the save succeeds.
 
+### Do you use Authentication Roles? ###
+
+If you use Authentication Roles, you will need to add a token to the end of your Nightscout URL when configuring your Endpoint.
+
+1. In your Nightscout Admin Tools, add a new subject and give it the "readable" role.
+    - If you **really** would like to be super specific, you could create a new role and set the permissions to `api:*:read`.
+1. After the new subject is created, copy the "Access Token" value for the new row in your subject table (**don't** copy the link, just copy the text).
+1. At the end of your Nighscout URL, add `?token={yourtoken}`, where `{yourtoken}` is the Access Token you just copied. Your new URL should look like `https://{yourdomain}/api/v1/googlehome?token={yourtoken}`.
+
 ### Test your skill out with the test tool
 
 Click on the "Test" tab on the top menu. This will take you to the page where you can test your new skill.

docs/plugins/alexa-templates/en-us.json

@@ -74,6 +74,16 @@
                 {
                     "name": "LIST_OF_METRICS",
                     "values": [
+                        {
+                            "name": {
+                                "value": "delta",
+                                "synonyms": [
+                                    "blood glucose delta",
+                                    "blood sugar delta",
+                                    "bg delta"
+                                ]
+                            }
+                        },
                         {
                             "name": {
                                 "value": "uploader battery",
@@ -162,6 +172,67 @@
                                     "raw blood glucose"
                                 ]
                             }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm noise"
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm tx age",
+                                "synonyms": [
+                                    "tx age",
+                                    "transmitter age",
+                                    "cgm transmitter age"
+                                ]
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm tx status",
+                                "synonyms": [
+                                    "tx status",
+                                    "transmitter status",
+                                    "cgm transmitter status"
+                                ]
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm battery",
+                                "synonyms": [
+                                    "cgm battery level",
+                                    "cgm battery levels",
+                                    "cgm batteries",
+                                    "cgm transmitter battery",
+                                    "cgm transmitter battery level",
+                                    "cgm transmitter battery levels",
+                                    "cgm transmitter batteries",
+                                    "transmitter battery",
+                                    "transmitter battery level",
+                                    "transmitter battery levels",
+                                    "transmitter batteries"
+                                ]
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm session age",
+                                "synonyms": [
+                                    "session age"
+                                ]
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm status"
+                            }
+                        },
+                        {
+                            "name": {
+                                "value": "cgm mode"
+                            }
                         }
                     ]
                 }

docs/plugins/googlehome-plugin.md

@@ -6,6 +6,7 @@
   - [Overview](#overview)
   - [Activate the Nightscout Google Home Plugin](#activate-the-nightscout-google-home-plugin)
   - [Create Your DialogFlow Agent](#create-your-dialogflow-agent)
+    - [Do you use Authentication Roles?](#do-you-use-authentication-roles)
     - [What questions can you ask it?](#what-questions-can-you-ask-it)
   - [Updating your agent with new features](#updating-your-agent-with-new-features)
   - [Adding support for additional languages](#adding-support-for-additional-languages)
@@ -56,6 +57,7 @@ To add Google Home support for your Nightscout site, here's what you need to do:
 1. After the import finishes, click the "DONE" button followed by the "SAVE" button.
 1. In the navigation pane on the left, click on "Fulfillment".
 1. Enable the toggle for "Webhook" and then fill in the URL field with your Nightscout URL: `https://YOUR-NIGHTSCOUT-SITE/api/v1/googlehome`
+    - If you use Authentication Roles, you'll need to add a bit to the end of your URL. See [the section](#do-you-use-authentication-roles) below.
 1. Scroll down to the bottom of the page and click the "SAVE" button.
 1. Click on "Integrations" in the navigation pane.
 1. Click on "INTEGRATION SETTINGS" for "Google Assistant".
@@ -65,6 +67,15 @@ To add Google Home support for your Nightscout site, here's what you need to do:
 
 That's it! Now try asking Google "Hey Google, ask *your Action's name* how am I doing?"
 
+### Do you use Authentication Roles? ###
+
+If you use Authentication Roles, you will need to add a token to the end of your Nightscout URL when configuring your Webhook.
+
+1. In your Nightscout Admin Tools, add a new subject and give it the "readable" role.
+    - If you **really** would like to be super specific, you could create a new role and set the permissions to `api:*:read`.
+1. After the new subject is created, copy the "Access Token" value for the new row in your subject table (**don't** copy the link, just copy the text).
+1. At the end of your Nighscout URL, add `?token=YOUR-TOKEN`, where `YOUR-TOKEN` is the Access Token you just copied. Your new URL should look like `https://YOUR-NIGHTSCOUT-SITE/api/v1/googlehome?token=YOUR-TOKEN`.
+
 ### What questions can you ask it?
 
 See [Interacting with Virtual Assistants](interacting-with-virtual-assistants.md) for details on what you can do with Google Home.

docs/plugins/interacting-with-virtual-assistants.md

@@ -43,6 +43,7 @@ This list is not meant to be comprehensive, nor does it include every way you ca
 - "Alexa, ask Nightscout what is my basal"
 - "Alexa, ask Nightscout what is my current basal"
 - "Alexa, ask Nightscout what is my cob"
+- "Alexa, ask Nightscout what is my delta"
 - "Alexa, ask Nightscout what is Charlie's carbs on board"
 - "Alexa, ask Nightscout what is Sophie's carbohydrates on board"
 - "Alexa, ask Nightscout what is Harper's loop forecast"
@@ -51,6 +52,15 @@ This list is not meant to be comprehensive, nor does it include every way you ca
 - "Alexa, ask Nightscout what is Arden's raw bg"
 - "Alexa, ask Nightscout what is Dana's raw blood glucose"
 
+*CGM Info:* (when using the [`xdripjs` plugin](/README.md#xdripjs-xdrip-js))
+
+- "Alexa, ask Nightscout what's my CGM status"
+- "Alexa, ask Nightscout what's my CGM session age"
+- "Alexa, ask Nightscout what's my CGM transmitter age"
+- "Alexa, ask Nightscout what's my CGM mode"
+- "Alexa, ask Nightscout what's my CGM noise"
+- "Alexa, ask Nightscout what's my CGM battery"
+
 *Insulin Remaining:*
 
 - "Alexa, ask Nightscout how much insulin do I have left"