Merge branch 'dev' into crowdin_incoming

Author: bewest

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [14.x, 16.x, 20, lts/*]
         mongodb-version: [4.4, 5.0, 6.0]
 
     steps:
@@ -87,4 +87,4 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           tags: |
             ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }}
-            ${{ env.DOCKER_IMAGE }}:latest
+            ${{ env.DOCKER_IMAGE }}:latest

README.md

@@ -112,7 +112,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
         - [`override` (Override Mode)](#override-override-mode)
         - [`xdripjs` (xDrip-js)](#xdripjs-xdrip-js)
         - [`alexa` (Amazon Alexa)](#alexa-amazon-alexa)
-        - [`googlehome` (Google Home/DialogFLow)](#googlehome-google-homedialogflow)
+        - [`googlehome` (Google Home/DialogFLow)](#googlehome-google-homedialogflow) [broken]
         - [`speech` (Speech)](#speech-speech)
         - [`cors` (CORS)](#cors-cors)
       - [Extended Settings](#extended-settings)
@@ -666,9 +666,11 @@ For remote overrides, the following extended settings must be configured:
 ##### `alexa` (Amazon Alexa)
   Integration with Amazon Alexa, [detailed setup instructions](docs/plugins/alexa-plugin.md)
 
-##### `googlehome` (Google Home/DialogFLow)
+##### `googlehome` (Google Home/DialogFLow) [broken]
   Integration with Google Home (via DialogFlow), [detailed setup instructions](docs/plugins/googlehome-plugin.md)
 
+  Unfortunately this integration broke when [Google discontinued conversational actions](https://developers.google.com/assistant/ca-sunset). We'll keep this here for reference, in case it can be revived at some point in the future.
+
 ##### `speech` (Speech)
   Speech synthesis plugin. When enabled, speaks out the blood glucose values, IOB and alarms. Note you have to set the LANGUAGE setting on the server to get all translated alarms.
 

docs/plugins/googlehome-plugin.md

@@ -1,3 +1,6 @@
+# The Google Assistant integration is broken!
+Unfortunately this integration broke when [Google discontinued conversational actions](https://developers.google.com/assistant/ca-sunset). We'll keep this here for reference, in case it can be revived at some point in the future.
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*

lib/plugins/openaps.js

@@ -392,7 +392,7 @@ function init (ctx) {
     function addSuggestion () {
       if (prop.lastSuggested) {
         var bg = prop.lastSuggested.bg;
-        var units = sbx.data.profile.getUnits();
+        var units = sbx.settings.units;
 
         if (units === 'mmol') {
           bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
@@ -478,9 +478,15 @@ function init (ctx) {
 
     if ('enacted' === prop.status.code) {
       var canceled = prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0;
+      var bg = prop.lastEnacted.bg;
+      var units = sbx.settings.units;
+
+      if (units === 'mmol') {
+        bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
+      }
 
       var valueParts = [
-        valueString('BG: ', prop.lastEnacted.bg)
+        valueString('BG: ', bg)
         , ', <b>Temp Basal' + (canceled ? ' Canceled' : ' Started') + '</b>'
         , canceled ? '' : ' ' + prop.lastEnacted.rate.toFixed(2) + ' for ' + prop.lastEnacted.duration + 'm'
         , valueString(', ', prop.lastEnacted.reason)

lib/server/bootevent.js

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
   "license": "AGPL-3.0",
   "author": "Nightscout Team",

package.json

@@ -92,6 +92,25 @@
     window.addEventListener('click', function() {
       showClose();
     });
+
+    // This fixes the issue of a "stale" CGM value displaying indefinately.
+    // It displays "Internet offline." until internet is restored.
+    function uOffline() { 
+      document.body.innerHTML =
+        'Internet offline.'
+    }
+    // Return to normal as soon as internet connectivity is restored.              
+    function uOnline() { 
+    	location.reload()
+    }
+    if(window.addEventListener) { 
+      window.addEventListener('offline', uOffline);
+      window.addEventListener('online', uOnline);
+    } else {
+      document.body.attachEvent('onoffline', uOffline);
+      document.body.attachEvent('ononline', uOnline);
+    }
+
     <% } %>
   </script>
   <%if (face == 'config') { %>