Merge branch 'dev' into bugfix/remove-remote-override-otp

.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/main.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
         mongodb-version: [4.2, 4.4]
 
     steps:
@@ -40,14 +40,19 @@ jobs:
       - name: Send Coverage
         run: npm run-script coverage
 
-  publish_dev:
-    name: Publish dev branch to Docker Hub
+  publish:
+    name: Publish to Docker Hub
     needs: test
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev' && github.repository_owner == 'nightscout'
+    if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') && github.repository_owner == 'nightscout'
     env:
       DOCKER_IMAGE: nightscout/cgm-remote-monitor
+      PLATFORMS: linux/amd64,linux/arm64
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
@@ -57,37 +62,29 @@ jobs:
         if: success()
         uses: actions/checkout@v2
       - name: Build, tag and push the dev Docker image
-        if: success()
-        run: |
-          docker build --no-cache=true -t ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }} .
-          docker image push ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }}
-          docker tag ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }} ${{ env.DOCKER_IMAGE }}:latest_dev
-          docker image push ${{ env.DOCKER_IMAGE }}:latest_dev
-
-  publish_master:
-    name: Publish master branch to Docker Hub
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository_owner == 'nightscout'
-    env:
-      DOCKER_IMAGE: nightscout/cgm-remote-monitor
-    steps:
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        if: success() && github.ref == 'refs/heads/dev'
+        uses: docker/build-push-action@v2
         with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-      - name: Clean git Checkout
-        if: success()
-        uses: actions/checkout@v2
-      - name: get-npm-version
-        if: success()
+          context: .
+          push: true
+          no-cache: true
+          platforms: ${{ env.PLATFORMS }}
+          tags: |
+            ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }}
+            ${{ env.DOCKER_IMAGE }}:latest_dev
+
+      - name: Get Nightscout release version
+        if: success() && github.ref == 'refs/heads/master'
         id: package-version
         uses: martinbeentjes/npm-get-version-action@master
       - name: Build, tag and push the master Docker image
-        if: success()
-        run: |
-          docker build --no-cache=true -t ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }} .
-          docker image push ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }}
-          docker tag ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }} ${{ env.DOCKER_IMAGE }}:latest
-          docker image push ${{ env.DOCKER_IMAGE }}:latest
+        if: success() && github.ref == 'refs/heads/master'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          no-cache: true
+          platforms: ${{ env.PLATFORMS }}
+          tags: |
+            ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }}
+            ${{ env.DOCKER_IMAGE }}:latest

.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)
 
@@ -149,23 +149,28 @@ you're welcome to issue a documentation pull request with instructions on how to
 
 ## 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 4
-- iOS 6
-- Chrome 35
-- Edge 17
-- Firefox 61
-- Opera 12.1
-- Safari 6 (macOS 10.7)
-- Internet Explorer: not supported
+- 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
 
-Some features may not work with devices/browsers on the older end of these requirements.
+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.
 
-## 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 +189,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.

azuredeploy.json

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

lib/client/hashauth.js

@@ -85,7 +85,7 @@ hashauth.init = function init (client, $) {
       client.browserUtils.reload();
     }
 
-    // clear eveything just in case
+    // clear everything just in case
     hashauth.apisecret = null;
     hashauth.apisecrethash = null;
     hashauth.authenticated = false;

lib/food/food.js

@@ -243,13 +243,13 @@ client.init(function loaded () {
             .append($('<img>').attr('title',translate('Edit record')).attr('src',icon_edit).attr('index',i).attr('class','fe_editimg'))
             .append($('<img>').attr('title',translate('Delete record')).attr('src',icon_remove).attr('index',i).attr('class','fe_removeimg'))
           )
-          .append($('<span>').addClass('width200px').append(foodlist[i].name))
+          .append($('<span>').addClass('width200px').text(foodlist[i].name))
           .append($('<span>').addClass('width150px').css('text-align','center').append(foodlist[i].portion))
-          .append($('<span>').addClass('width50px').css('text-align','center').append(foodlist[i].unit))
+          .append($('<span>').addClass('width50px').css('text-align','center').text(foodlist[i].unit))
           .append($('<span>').addClass('width100px').css('text-align','center').append(foodlist[i].carbs))
           .append($('<span>').addClass('width100px').css('text-align','center').append(foodlist[i].gi))
-          .append($('<span>').addClass('width150px').append(foodlist[i].category))
-          .append($('<span>').addClass('width150px').append(foodlist[i].subcategory))
+          .append($('<span>').addClass('width150px').text(foodlist[i].category))
+          .append($('<span>').addClass('width150px').text(foodlist[i].subcategory))
           .append($('<span>').addClass('width100px').append(foodlist[i].fat))
           .append($('<span>').addClass('width100px').append(foodlist[i].protein))
           .append($('<span>').addClass('width100px').append(foodlist[i].energy))

lib/server/app.js

@@ -320,7 +320,7 @@ function create (env, ctx) {
   }
 
   // Production bundling
-  const tmpFiles =  express.static(resolvePath('/tmp/public'), {
+  const tmpFiles =  express.static(resolvePath('/node_modules/.cache/_ns_cache/public'), {
     maxAge: maxAge
   });
 
@@ -343,7 +343,7 @@ function create (env, ctx) {
       , coffee_match: /coffeescript/
       , json_match: /json/
       , cssmin: myCssmin
-      , cache: resolvePath('/tmp/public')
+      , cache: resolvePath('/node_modules/.cache/_ns_cache/public')
       , onerror: undefined
     , }));
 

lib/server/bootevent.js

@@ -23,7 +23,8 @@ function boot (env, language) {
 
   //////////////////////////////////////////////////
   // Check Node version.
-  // Latest Node 10 to 14 LTS are recommended and supported.
+  // Latest Node LTS releases are recommended and supported.
+  // Current Node releases MAY work, but are not recommended. Will be tested in CI
   // Older Node versions or Node versions with known security issues will not work.
   ///////////////////////////////////////////////////
   function checkNodeVersion (ctx, next) {
@@ -34,10 +35,10 @@ function boot (env, language) {
     var nodeVersion = process.version;
 
     const isLTS = process.release.lts ? true : false;
-  
-    if (isLTS && (semver.satisfies(nodeVersion, '^16.0.0') || semver.satisfies(nodeVersion, '^14.0.0') || semver.satisfies(nodeVersion, '^12.0.0') || semver.satisfies(nodeVersion, '^10.0.0'))) {
-      //Latest Node 10 LTS and Node 12 LTS are recommended and supported.
-      //Require at least Node 8 LTS and Node 10 LTS without known security issues
+
+    if (isLTS && (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');
       next();
       return;
@@ -71,11 +72,15 @@ function boot (env, language) {
     var configURL = env.IMPORT_CONFIG || null;
     var url = require('url');
     var href = null;
-    try {
-      href = url.parse(configURL).href;
-    } catch (e) {
-      console.error('Parsing config URL from IMPORT_CONFIG failed');
+
+    if (configURL) {
+      try {
+        href = url.parse(configURL).href;
+      } catch (e) {
+        console.error('Parsing config URL from IMPORT_CONFIG failed');
+      }
     }
+
     if(configURL && href) {
       var request = require('request');
       console.log('Getting settings from', href);
@@ -266,7 +271,7 @@ function boot (env, language) {
   function setupListeners (ctx, next) {
 
     console.log('Executing setupListeners');
-    
+
     if (hasBootErrors(ctx)) {
       return next();
     }

lib/server/enclave.js

@@ -19,7 +19,7 @@ const init = function init () {
   let apiKeySet = false;
 
   function readKey (filename) {
-    let filePath = path.resolve(__dirname + '/../../tmp/' + filename);
+    let filePath = path.resolve(__dirname + '/../../node_modules/.cache/_ns_cache/' + filename);
     if (fs.existsSync(filePath)) {
       return fs.readFileSync(filePath).toString().trim();
     }