Merge remote-tracking branch 'nightscout/dev' into test

bjornoleh · Dec 20, 2024 · 6a7e0df · 6a7e0df
2 parents 23dbdc2 + 7d209bc
commit 6a7e0df
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
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.
 

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/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;
@@ -479,11 +479,11 @@ 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.data.profile.getUnits();
+      var units = sbx.settings.units;
 
-        if (units === 'mmol') {
-          bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
-        }
+      if (units === 'mmol') {
+        bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
+      }
 
       var valueParts = [
         valueString('BG: ', bg)

diff --git a/lib/server/bootevent.js b/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');