Merge branch 'dev' into wip/bewest/restore-8026

bewest · web-flow · commit 45e6aa010ddf · 2026-01-15T10:33:05.000-08:00
diff --git a/.github/workflows/main.yml b/.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
diff --git a/README.md b/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.
 
@@ -750,7 +752,7 @@ For remote overrides, the following extended settings must be configured:
   * `ns-info` - Plugins that generate notifications at the info level will cause this event to also be triggered.  It will be sent in addition to `ns-event`.
   * `ns-warning` - Alarms at the warning level with cause this event to also be triggered.  It will be sent in addition to `ns-event`.
   * `ns-urgent` - Alarms at the urgent level with cause this event to also be triggered.  It will be sent in addition to `ns-event`.
-  * see the [full list of events](lib/plugins/maker-setup.md#events)
+  * see the [full list of events](docs/plugins/maker-setup.md#events)
 
 
 ### Treatment Profile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,7 @@ x-logging:
 services:
   mongo:
     image: mongo:4.4
+    restart: always
     volumes:
       - ${NS_MONGO_DATA_DIR:-./mongo-data}:/data/db:cached
     logging: *default-logging
@@ -65,6 +66,7 @@ services:
 
   traefik:
     image: traefik:latest
+    restart: always
     container_name: 'traefik'
     command:
       - '--providers.docker=true'
diff --git a/docs/plugins/googlehome-plugin.md b/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)*
diff --git a/lib/client/browser-utils.js b/lib/client/browser-utils.js
@@ -15,7 +15,7 @@ function init ($) {
   $.fn.tooltip.defaults = {
     fade: true
     , gravity: 'n'
-    , opacity: 0.75
+    , opacity: 0.9
   };
 
   $('#drawerToggle').click(function(event) {
diff --git a/lib/client/index.js b/lib/client/index.js
@@ -192,7 +192,7 @@ client.load = function load (serverSettings, callback) {
 
   client.tooltip = d3.select('body').append('div')
     .attr('class', 'tooltip')
-    .style('opacity', 0);
+    .style('display', 'none');
 
   client.settings = browserSettings(client, serverSettings, $);
 
diff --git a/lib/client/renderer.js b/lib/client/renderer.js
@@ -54,7 +54,7 @@ function init (client, d3) {
   }
 
   function hideTooltip () {
-    client.tooltip.style('opacity', 0);
+    client.tooltip.style('display', 'none');
   }
 
   // get the desired opacity for context chart based on the brush extent
@@ -147,7 +147,7 @@ function init (client, d3) {
 
       var rawbgInfo = getRawbgInfo();
 
-      client.tooltip.style('opacity', .9);
+      client.tooltip.style('display', 'block');
       client.tooltip.html('<strong>' + translate('BG') + ':</strong> ' + client.sbx.scaleEntry(d) +
           (d.type === 'mbg' ? '<br/><strong>' + translate('Device') + ': </strong>' + d.device : '') +
           (d.type === 'forecast' && d.forecastType ? '<br/><strong>' + translate('Forecast Type') + ': </strong>' + d.forecastType : '') +
@@ -338,7 +338,7 @@ function init (client, d3) {
     prepareTreatCircles(treatCircles.enter().append('circle'))
       .attr('class', 'treatment-dot')
       .on('mouseover', function(d) {
-        client.tooltip.style('opacity', .9);
+        client.tooltip.style('display', 'block');
         client.tooltip.html(d.isAnnouncement ? announcementTooltip(d) : treatmentTooltip(d))
           .style('left', tooltipLeft())
           .style('top', (d3.event.pageY + 15) + 'px');
@@ -435,7 +435,7 @@ function init (client, d3) {
       .attr('class', 'g-duration')
       .attr('transform', rectTranslate)
       .on('mouseover', function(d) {
-        client.tooltip.style('opacity', .9);
+        client.tooltip.style('display', 'block');
         client.tooltip.html(d.isAnnouncement ? announcementTooltip(d) : treatmentTooltip(d))
           .style('left', tooltipLeft())
           .style('top', (d3.event.pageY + 15) + 'px');
@@ -640,7 +640,7 @@ function init (client, d3) {
         glucose = Math.round(glucose * decimals) / decimals;
       }
 
-      client.tooltip.style('opacity', .9);
+      client.tooltip.style('display', 'block');
       client.tooltip.html('<strong>' + translate('Time') + ':</strong> ' + client.formatTime(getOrAddDate(treatment)) + '<br/>' + '<strong>' + translate('Treatment type') + ':</strong> ' + translate(client.careportal.resolveEventName(treatment.eventType)) + '<br/>' +
           (treatment.carbs ? '<strong>' + translate('Carbs') + ':</strong> ' + treatment.carbs + '<br/>' : '') +
           (treatment.protein ? '<strong>' + translate('Protein') + ':</strong> ' + treatment.protein + '<br/>' : '') +
@@ -667,7 +667,7 @@ function init (client, d3) {
         //console.log(treatment);
         var windowWidth = $(client.tooltip.node()).parent().parent().width();
         var left = d3.event.x + TOOLTIP_WIDTH < windowWidth ? d3.event.x : windowWidth - TOOLTIP_WIDTH - 10;
-        client.tooltip.style('opacity', .9)
+        client.tooltip.style('display', 'block')
           .style('left', left + 'px')
           .style('top', (d3.event.pageY ? d3.event.pageY + 15 : 40) + 'px');
 
@@ -762,7 +762,7 @@ function init (client, d3) {
       })
       .on('drag', function() {
         //console.log(d3.event);
-        client.tooltip.style('opacity', .9);
+        client.tooltip.style('display', 'block');
         var x = Math.min(Math.max(0, d3.event.x), chart().charts.attr('width'));
         var y = Math.min(Math.max(0, d3.event.y), chart().focusHeight);
 
@@ -1268,7 +1268,7 @@ function init (client, d3) {
       })
       .text(generateText)
       .on('mouseover', function(d) {
-        client.tooltip.style('opacity', .9);
+        client.tooltip.style('display', 'block');
         client.tooltip.html(profileTooltip(d))
           .style('left', (d3.event.pageX) + 'px')
           .style('top', (d3.event.pageY + 15) + 'px');
diff --git a/lib/constants.json b/lib/constants.json
@@ -7,7 +7,7 @@
   "HTTP_BAD_REQUEST": 400,
   "ENTRIES_DEFAULT_COUNT" : 10,
   "PROFILES_DEFAULT_COUNT" : 10, 
-  "MMOL_TO_MGDL": 18.018018018,
+  "MMOL_TO_MGDL": 18.01559,
   "ONE_DAY" : 86400000,
   "TWO_DAYS" : 172800000,
   "FIFTEEN_MINUTES": 900000,
diff --git a/lib/plugins/openaps.js b/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)
diff --git a/lib/plugins/pluginbase.js b/lib/plugins/pluginbase.js
@@ -84,7 +84,7 @@ function init (majorPills, minorPills, statusPills, bgStatus, tooltip) {
       }).join('<br/>\n');
 
       pill.mouseover(function pillMouseover (event) {
-        tooltip.style('opacity', .9);
+        tooltip.style('display', 'block');
 
         var windowWidth = $(tooltip.node()).parent().parent().width();
         var left = event.pageX + TOOLTIP_WIDTH < windowWidth ? event.pageX : windowWidth - TOOLTIP_WIDTH - 10;
@@ -94,7 +94,7 @@ function init (majorPills, minorPills, statusPills, bgStatus, tooltip) {
       });
 
       pill.mouseout(function pillMouseout ( ) {
-        tooltip.style('opacity', 0);
+        tooltip.style('display', 'none');
       });
     } else {
       pill.off('mouseover');
diff --git a/lib/report_plugins/dailystats.js b/lib/report_plugins/dailystats.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var consts = require('../constants');
+
 var dailystats = {
   name: 'dailystats'
   , label: 'Daily Stats'
@@ -62,6 +64,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
   $('<th>' + translate('25%') + '</th>').appendTo(thead);
   $('<th>' + translate('Median') + '</th>').appendTo(thead);
   $('<th>' + translate('75%') + '</th>').appendTo(thead);
+  $('<th>' + translate('A1c est* %<sub>DCCT</sub>') + '</th>').appendTo(thead);
+  $('<th>' + translate('A1c est* <sub>IFCC</sub>') + '</th>').appendTo(thead);
   thead.appendTo(table);
 
   sorteddaystoshow.forEach(function(day) {
@@ -104,6 +108,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
       , highs: 0
     });
     var average = sum / daysRecords.length;
+    var averageA1cDCCT = (average * consts.MMOL_TO_MGDL + 46.7) / 28.7;
+    var averageA1cIFCC = ((average * consts.MMOL_TO_MGDL + 46.7) / 28.7 - 2.15) * 10.929;
 
     var bgValues = daysRecords.map(function(r) { return r.sgv; });
     $('<td><div id="dailystat-chart-' + day.toString() + '" class="inlinepiechart"></div></td>').appendTo(tr);
@@ -120,6 +126,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.25).toFixed(1) + '</td>').appendTo(tr);
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.5).toFixed(1) + '</td>').appendTo(tr);
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.75).toFixed(1) + '</td>').appendTo(tr);
+    $('<td class="tdborder">' + averageA1cDCCT.toFixed(1) + '%</td>').appendTo(tr);
+    $('<td class="tdborder">' + averageA1cIFCC.toFixed(0) + '</td>').appendTo(tr);
 
     table.append(tr);
     var inrange = [
diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
@@ -302,7 +302,7 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
         })
         .on('mouseover', function(d) {
           if (options.openAps && d.openaps) {
-            client.tooltip.style('opacity', .9);
+            client.tooltip.style('display', 'block');
             var text = '<b>BG:</b> ' + d.openaps.suggested.bg +
               ', ' + d.openaps.suggested.reason +
               (d.openaps.suggested.mealAssist ? ' <b>Meal Assist:</b> ' + d.openaps.suggested.mealAssist : '');
@@ -1109,6 +1109,6 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
   }
 
   function hideTooltip () {
-    client.tooltip.style('opacity', 0);
+    client.tooltip.style('display', 'none');
   }
 };
diff --git a/lib/report_plugins/weektoweek.js b/lib/report_plugins/weektoweek.js
@@ -317,7 +317,7 @@ function init (ctx) {
     }
 
     function hideTooltip () {
-      client.tooltip.style('opacity', 0);
+      client.tooltip.style('display', 'none');
     }
   };
   return weektoweek;
diff --git a/lib/storage/mongo-storage.js b/lib/storage/mongo-storage.js
@@ -42,7 +42,7 @@ function init(env, cb, forceNewConnection) {
 
           const result = await mongo.db.command({ connectionStatus: 1 });
           const roles = result.authInfo.authenticatedUserRoles;
-          if (roles.length > 0 && roles[0].role == 'readAnyDatabase') {
+          if (roles && roles.length > 0 && roles[0].role == 'readAnyDatabase') {
             console.error('Mongo user is read only');
             cb(new Error('MongoDB connection is in read only mode! Go back to MongoDB configuration and check your database user has read and write access.'), null);
           }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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",
diff --git a/translations/fr_FR.json b/translations/fr_FR.json
@@ -70,10 +70,10 @@
     "Normal": "Normal",
     "Median": "Médiane",
     "Readings": "Valeurs",
-    "StDev": "Déviation St.",
+    "StDev": "Dév. std.",
     "Daily stats report": "Rapport quotidien",
-    "Glucose Percentile report": "Rapport percentiles Glycémie",
-    "Glucose distribution": "Distribution glycémies",
+    "Glucose Percentile report": "Rapport centiles glucose",
+    "Glucose distribution": "Distribution du glucose",
     "days total": "jours totaux",
     "Total per day": "Total journalier",
     "Overall": "En général",
diff --git a/views/clockviews/clock.html b/views/clockviews/clock.html
@@ -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') { %>
