#11

.deployment

@@ -1,2 +1,2 @@
 [config]
-command = bash deploy.sh
+command = bash bin/azure-deploy.sh

.eslintrc.js

@@ -1,23 +1,35 @@
 module.exports = {
-    "plugins": [ ],
-    "extends": [
-      "eslint:recommended"
+    'plugins': [
+      'security'
     ],
-    "parser": "babel-eslint",
-    "env": {
-      "browser": true,
-      "commonjs": true,
-      "es6": true,
-      "node": true,
-      "mocha": true,
-      "jquery": true
+    'extends': [
+      'eslint:recommended',
+      'plugin:security/recommended'
+    ],
+    'parser': 'babel-eslint',
+    'env': {
+      'browser': true,
+      'commonjs': true,
+      'es6': true,
+      'node': true,
+      'mocha': true,
+      'jquery': true
     },
-    "rules": {
-      "no-unused-vars": [
-        "error",
+    'rules': {
+      'security/detect-object-injection' : 0,
+      'no-unused-vars': [
+        'error',
         {
-          "varsIgnorePattern": "should|expect"
+          'varsIgnorePattern': 'should|expect'
         }
       ]
-    }
+    },
+    'overrides': [
+      {
+        'files': ['lib/client/*.js'],
+        'rules': {
+          'security/detect-object-injection': 0
+        }
+      }
+    ],
   };

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -5,6 +5,10 @@ label: bug
 
 ---
 
+**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
+For support, please post a question to the "CGM in The Cloud" group in Facebook
+(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 

.github/ISSUE_TEMPLATE/--feature-request--.md

@@ -4,6 +4,10 @@ about: Suggest an idea for this project
 
 ---
 
+**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
+For support, please post a question to the "CGM in The Cloud" group in Facebook
+(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Troubleshooting Documentation
+    url: http://nightscout.github.io/troubleshoot/troublehoot/
+    about: Having trouble with Nightscout? Please check our step by step troubleshooting instructions.
+  - name: Nightscout Community Support in Facebook
+    url: https://www.facebook.com/groups/cgminthecloud
+    about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.
+  - name: Nightscout Community Support in Discord
+    url: https://discord.gg/zg7CvCQ
+    about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+# ******** NOTE ********
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '43 23 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/dev' && github.repository_owner == 'nightscout'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/main.yml

@@ -1,32 +1,93 @@
-name: CI test
+name: CI test and publish Docker image
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - master
+      - dev
 
 jobs:
-  build:
-
-    runs-on: ubuntu-16.04
-
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x]
+        node-version: [12.x, 14.x]
+        mongodb-version: [4.2, 4.4]
+
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Start MongoDB ${{ matrix.mongodb-version }}
+        uses: supercharge/[email protected]
+        with:
+          mongodb-version: ${{ matrix.mongodb-version }}
+
+      - name: Install dependencies
+        run: npm install
+      - name: Run Tests
+        run: npm run-script test-ci
+      - name: Send Coverage
+        run: npm run-script coverage
+
+  publish_dev:
+    name: Publish dev branch to Docker Hub
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/dev' && github.repository_owner == 'nightscout'
+    env:
+      DOCKER_IMAGE: nightscout/cgm-remote-monitor
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Clean git Checkout
+        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:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install dependencies
-      run: npm install
-    - name: Install MongoDB
-      run: |
-        wget -qO - https://www.mongodb.org/static/pgp/server-3.6.asc | sudo apt-key add -
-        echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list
-        sudo apt-get update
-        sudo apt-get install -y mongodb-org
-        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
-      run: npm run-script test-ci
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        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()
+        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

.gitignore

@@ -9,6 +9,7 @@ bundle/bundle.out.js
 *.iml
 my.env
 my.*.env
+*.pem
 
 static/bower_components/
 .*.sw?
@@ -28,5 +29,8 @@ npm-debug.log
 /cgm-remote-monitor.njsproj
 /cgm-remote-monitor.sln
 /obj/Debug
-/bin
 /*.bat
+
+# directories created by docker-compose.yml
+mongo-data/
+letsencrypt/

.nvmrc

@@ -1 +1 @@
-10.16.0
+14.15.3