Merge branch 'master' into listener_clnt_m5stickc_update

Author: Jocke4f

Diff for: .github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: #
+github: josephdadams #
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

Diff for: .github/codeql/codeql-config.yml

@@ -0,0 +1,6 @@
+name: "TallyArbiter CodeQL Scanning"
+
+paths-ignore: 
+  - node_modules
+  - ui-dist
+  - '**/*.test.js'

Diff for: .github/workflows/build-listener-clients.yaml

@@ -1,22 +1,31 @@
 name: Build Listener Clients
 
-on: [push, workflow_dispatch]
+on: 
+  push:
+    paths:
+      - 'listener_clients/**'
+      - '.github/workflows/build-listener-clients.yaml'
+  pull_request:
+    paths:
+      - 'listener_clients/**'
+      - '.github/workflows/build-listener-clients.yaml'
+  workflow_dispatch:
 
 jobs:
   build_m5stickc-listener:
     name: Build M5StickC Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - uses: arduino/compile-sketches@v1
       with:
         platforms: |
           - name: esp32:esp32
             source-url: https://dl.espressif.com/dl/package_esp32_index.json
         fqbn: 'esp32:esp32:m5stick-c'
         libraries: |
-          - source-url: https://github.com/m5stack/M5StickC/archive/refs/tags/0.2.4.zip
-          - source-url: https://github.com/m5stack/M5StickC-Plus/archive/refs/tags/0.0.4.zip
+          - source-url: https://github.com/m5stack/M5StickC/archive/refs/tags/0.2.9.zip
+          - source-url: https://github.com/m5stack/M5StickC-Plus/archive/refs/tags/0.1.0.zip
           - name: WebSockets
           - name: WiFiManager
           - name: MultiButton
@@ -27,7 +36,7 @@ jobs:
           - listener_clients/m5stickc-listener
         enable-deltas-report: true
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: 'TallyArbiter-Listener-M5StickC'
         path: 'listener_clients/m5stickc-listener/build/esp32.esp32.m5stick-c'
@@ -36,15 +45,15 @@ jobs:
     name: Build M5Atom Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - uses: arduino/compile-sketches@v1
       with:
         platforms: |
           - name: esp32:esp32
             source-url: https://dl.espressif.com/dl/package_esp32_index.json
         fqbn: 'esp32:esp32:m5stack-atom'
         libraries: |
-          - source-url: https://github.com/m5stack/M5Atom/archive/refs/tags/0.0.6.zip
+          - source-url: https://github.com/m5stack/M5Atom/archive/refs/tags/0.1.2.zip
           - name: WebSockets
           - name: WiFiManager
           - name: MultiButton
@@ -56,7 +65,7 @@ jobs:
           - listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom
         enable-deltas-report: true
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: 'TallyArbiter-Listener-M5Atom'
         path: 'listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom/build/esp32.esp32.m5stack-atom'
@@ -65,7 +74,7 @@ jobs:
     name: Build ESP32 NeoPixel Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - uses: arduino/compile-sketches@v1
       with:
         platforms: |
@@ -84,7 +93,7 @@ jobs:
           - listener_clients/esp32-neopixel-listener
         enable-deltas-report: true
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: 'TallyArbiter-Listener-ESP32-NeoPixel'
         path: 'listener_clients/esp32-neopixel-listener/build/esp32.esp32.esp32'
@@ -105,10 +114,10 @@ jobs:
     name: Build ${{ matrix.board.name }} Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Setup TFT_eSPI and select User Setup
       run: |
-        git clone https://github.com/Bodmer/TFT_eSPI/
+        git clone --branch v2.5.33 https://github.com/Bodmer/TFT_eSPI/
         cd TFT_eSPI
         sed -i 's/#include <User_Setup.h>/\/\/#include <User_Setup.h>/g' User_Setup_Select.h
         sed -i 's/\/\/#include <User_Setups\/Setup22_TTGO_T4.h>/#include <User_Setups\/Setup22_TTGO_T4.h>/g' User_Setup_Select.h
@@ -135,7 +144,7 @@ jobs:
         FQBN_REPLACED=$(echo $RAW_FQBN | sed 's/:/./g')
         echo "FQBN_REPLACED=$FQBN_REPLACED" >> $GITHUB_ENV
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: 'TallyArbiter-Listener-${{ matrix.board.name }}'
         path: 'listener_clients/TTGO_T-listener/build/${{ env.FQBN_REPLACED }}'
@@ -144,7 +153,7 @@ jobs:
     name: Analyse Blink1 Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Install prosepector
       run: pip install prospector[with_everything]
     - name: Analyse
@@ -155,7 +164,7 @@ jobs:
     name: Analyse Pimoroni Blinkt Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Install prosepector
       run: pip install prospector[with_everything]
     - name: Analyse
@@ -166,7 +175,7 @@ jobs:
     name: Analyse GPO Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Install prosepector
       run: pip install prospector[with_everything]
     - name: Analyse
@@ -177,13 +186,13 @@ jobs:
     name: Analyse Relay Listener
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Install dependencies
-      working-directory: listener_clients/relay-listener
-      run: |
-        sudo apt install libudev-dev libusb-1.0-0 libusb-1.0-0-dev
-        npm install
-        npm install --global eslint
-    - name: Run eslint
-      working-directory: listener_clients/relay-listener
-      run: eslint index.js || exit 0
+    - uses: actions/checkout@v4
+    #- name: Install dependencies
+    #  working-directory: listener_clients/relay-listener
+    #  run: |
+    #    sudo apt install libudev-dev libusb-1.0-0 libusb-1.0-0-dev
+    #    npm install
+    #    npm install --global eslint
+    #- name: Run eslint
+    #  working-directory: listener_clients/relay-listener
+    #  run: eslint index.js || exit 0

Diff for: .github/workflows/build.yml

@@ -1,19 +1,19 @@
 name: Build
 
-on: [push, workflow_dispatch]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build_cli:
     name: Build CLI on Ubuntu
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Setup Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
-        node-version: 14
+        node-version: 20
     - name: Install dependencies
-      run: npm i
+      run: npm i -f
     - name: Create env file
       run: |
         touch .env
@@ -38,13 +38,13 @@ jobs:
     name: Build Docker image on Ubuntu
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Setup Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
-        node-version: 14
+        node-version: 20
     - name: Install dependencies and build
-      run: npm i; npm run build
+      run: npm i -f; npm run build
     - name: Set up QEMU
       if: startsWith(github.ref, 'refs/tags/v')
       uses: docker/setup-qemu-action@master
@@ -99,20 +99,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-2022, ubuntu-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Setup Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
-        node-version: 14
+        node-version: 20
     - name: Create env file
       run: |
         touch .env
         echo SENTRY_ENABLED=1 >> .env
         echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
     - name: Install dependencies and build
-      run: npm i; npm run build
+      run: npm i -f; npm run build
     - name: Build
       uses: samuelmeuli/[email protected]
       with:

Diff for: .github/workflows/codeql-analysis.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript', 'python' ]
 
     steps:
     - name: Checkout repository
@@ -29,6 +29,7 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
+        config-file: ./.github/codeql/codeql-config.yml
         languages: ${{ matrix.language }}
 
     - name: Setup Node.js
@@ -37,7 +38,7 @@ jobs:
         node-version: 14
 
     - name: Install dependencies
-      run: npm i
+      run: npm i -f
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
@@ -57,19 +58,14 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-
     - name: Setup Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 14
+        node-version: 18
 
     - name: Install dependencies and build
       run: |
-        npm i
+        npm i -f
         npm run build; cd UI; npm run build
 
     - name: Build an image from Dockerfile

Diff for: .github/workflows/welcome-first-time-contributor.yml

@@ -20,11 +20,9 @@ jobs:
 
           Welcome to TallyArbiter!
 
-          Thank you for opening your first issue for the Tally Arbiter project. TallyArbiter fosters an open and welcoming environment for all our contributors. Please adhere to our [Code Of Conduct](https://github.com/josephdadams/TallyArbiter/blob/master/CODE_OF_CONDUCT.md).
+          Thank you for opening your first issue for the Tally Arbiter project. Tally Arbiter fosters an open and welcoming environment for all our contributors. Please adhere to our [Code Of Conduct](https://github.com/josephdadams/TallyArbiter/blob/master/CODE_OF_CONDUCT.md).
 
-          Incase you want to claim this issue, please comment down below! We will try to get back to you as soon as we can.
-
-          Feel free to contact the author or for any other information, please visit [www.techministry.blog](www.techministry.blog). We would love to hear your interesting ideas and engage in discussions.
+          If you have more to contribute to this issue, please comment down below! We will try to get back to you as soon as we can.
 
         pr-message: |
           Hello there ${{ github.actor }} 👋

Diff for: .gitignore

@@ -132,6 +132,13 @@ config_relays.json
 *.hex
 *.hex.bin
 
+# don't include Python listener clients dev files
+venv
+env
+
 # don't include .DS_Store file and vscode workspace file
 .DS_Store
 TallyArbiter.code-workspace
+
+# Angular Cache
+UI/.angular/cache

Diff for: .gitpod.yml

@@ -1,9 +1,18 @@
 tasks:
-  - init: npm i -g npm redundancyjs; cd UI; npm i --ignore-scripts; npm run build; cd ..; npm i --ignore-scripts
+  - name: Server
+    init: npm i -g npm redundancyjs; cd UI; npm i --ignore-scripts; npm run build; cd ..; npm i --ignore-scripts; npm rebuild bcrypt; gp sync-done server
     command: npm start
+  - name: Angular serve
+    init: gp sync-await server
+    command: cd UI; npm start
+    openMode: split-right
 ports:
   - port: 4455
-    onOpen: open-preview
+    onOpen: notify
+    visibility: public
+  - port: 4200
+    onOpen: notify
+    visibility: public
   - port: 8099
     onOpen: ignore
   - port: 5958

Diff for: Dockerfile

@@ -3,7 +3,14 @@ FROM alpine
 WORKDIR /app
 COPY package.json package-lock.json dist ./
 COPY ui-dist /app/ui-dist
-RUN apk add --update nodejs npm; npm i --ignore-script --only=prod
+RUN apk add --update nodejs npm \
+    && apk add --no-cache --virtual .build-deps alpine-sdk python3 \
+    && npm install node-gyp -g \
+    && npm i --ignore-script --omit=dev \
+    && npm uninstall bcrypt \
+    && npm install bcrypt \
+    && npm uninstall node-gyp -g \
+    && apk del .build-deps
 
 EXPOSE 4455 8099 5958
 CMD ["node", "index.js"]