Merge branch 'develop' into feature/proper-mdns-support

Author: hhvrc

.changeset/mighty-pets-report.md

@@ -0,0 +1,5 @@
+---
+'frontend': patch
+---
+
+Improve authtoken handling in 401 responses

.changeset/precious-eagle-cactus-fruit.md

@@ -0,0 +1,5 @@
+---
+'firmware': patch
+---
+
+fix: Serial now uses CRLF rather than just LF for better compatibility

.github/actions/build-frontend/action.yml

@@ -1,6 +1,9 @@
 name: build-frontend
 description: Builds the frontend and uploads it as an artifact
 inputs:
+  pnpm-version:
+    description: 'pnpm version to use'
+    required: true
   node-version:
     description: 'NodeJS runtime version to use'
     required: true
@@ -18,21 +21,43 @@ runs:
           frontend
         path: ${{ github.repository }}
 
+    - uses: pnpm/action-setup@v4
+      name: Install pnpm
+      with:
+        version: ${{ inputs.pnpm-version }}
+        run_install: false
+
     - uses: actions/setup-node@v4
       with:
-        node-version: ${{ inputs.node-version }}
-        cache: 'npm'
-        cache-dependency-path: ./frontend/package-lock.json
+        node-version-file: ./frontend/.nvmrc
+        cache: 'pnpm'
+        cache-dependency-path: ./frontend/pnpm-lock.yaml
 
     - name: Install dependencies
       working-directory: ./frontend
       shell: bash
-      run: npm ci
+      run: pnpm install --frozen-lockfile --strict-peer-dependencies
+
+    - name: Check
+      working-directory: ./frontend
+      shell: bash
+      run: pnpm run check
+
+    # FIXME: Playwirght is not working: Error: browserType.launch: Executable doesn't exist at /home/runner/.cache/ms-playwright/chromium_headless_shell-1161/chrome-linux/headless_shell
+    #    - name: Install playwright
+    #      working-directory: ./frontend
+    #      shell: bash
+    #      run: pnpx playwright install --with-deps
+
+    - name: Test
+      working-directory: ./frontend
+      shell: bash
+      run: pnpm test:unit # TODO: Change back to pnpm test when playwright is working
 
     - name: Build
       working-directory: ./frontend
       shell: bash
-      run: npm run build
+      run: pnpm run build
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

.github/actions/cdn-bump-version/action.yml

@@ -1,8 +1,20 @@
 name: cdn-bump-version
 description: Uploads version file to CDN
 inputs:
-  cf-bucket:
-    description: Name of the S3 bucket
+  bunny-stor-hostname:
+    description: Bunny SFTP Hostname
+    required: true
+  bunny-stor-username:
+    description: Bunny SFTP Username
+    required: true
+  bunny-stor-password:
+    description: Bunny SFTP Password
+    required: true
+  bunny-api-key:
+    description: Bunny API key
+    required: true
+  bunny-cdn-url:
+    description: Bunny pull zone base url e.g. https://firmware.openshock.org (no trailing slash)
     required: true
   version:
     description: 'Version of the release'
@@ -14,9 +26,26 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Upload version file
+    - name: Prepare Upload Folder
       shell: bash
       run: |
         mkdir -p upload
         echo "${{ inputs.version }}" >> upload/version-${{ inputs.release-channel }}.txt
-        rclone copy upload cdn:${{ inputs.cf-bucket }}/
+
+    - name: Upload version file
+      uses: milanmk/actions-file-deployer@master
+      with:
+        remote-protocol: "sftp"
+        remote-host: "${{ inputs.bunny-stor-hostname }}"
+        remote-user: "${{ inputs.bunny-stor-username }}"
+        remote-password: "${{ inputs.bunny-stor-password }}"
+        remote-path: "/"
+        local-path: "upload"
+        sync: "full"
+
+    - name: Purge CDN cache
+      shell: bash
+      run: |
+        curl -X POST "https://api.bunny.net/purge?url=${{ inputs.bunny-cdn-url }}/version-${{ inputs.release-channel }}.txt" \
+          -H "Content-Type: application/json" \
+          -H "AccessKey: ${{ inputs.bunny-api-key }}"

.github/actions/cdn-prepare/action.yml

@@ -1,33 +1,20 @@
 name: cdn-prepare
-description: Prepares the CDN for firmware uploads
+description: Bunny sshpass and knowhosts setup
 inputs:
-  cf-account-id:
-    description: Cloudflare Account ID
-    required: true
-  cf-access-key-id:
-    description: Cloudflare Access Key ID
-    required: true
-  cf-secret-access-key:
-    description: Cloudflare Secret Access Key
+  bunny-ssh-knownhosts:
+    description: Bunny SFTP Hostname
     required: true
 
 runs:
   using: composite
   steps:
-    - name: Install rclone
+    - name: Install sshpass
       shell: bash
-      run: sudo apt-get install -y rclone
+      run: sudo apt-get install -y sshpass
 
-    - name: Configure rclone
+    - name: Configure known hosts
       shell: bash
       run: |
-        mkdir -p ~/.config/rclone/
-        conf=~/.config/rclone/rclone.conf
-        echo "[cdn]" >> $conf
-        echo "type = s3" >> $conf
-        echo "provider = Cloudflare" >> $conf
-        echo "access_key_id = ${{ inputs.cf-access-key-id }}" >> $conf
-        echo "secret_access_key = ${{ inputs.cf-secret-access-key }}" >> $conf
-        echo "endpoint = https://${{ inputs.cf-account-id }}.r2.cloudflarestorage.com" >> $conf
-        echo "acl = public-read" >> $conf
+        mkdir -p ~/.ssh
+        echo "${{ inputs.bunny-ssh-knownhosts }}" >> ~/.ssh/known_hosts
 

.github/actions/cdn-upload-firmware/action.yml

@@ -1,8 +1,14 @@
 name: cdn-upload-firmware
 description: Uploads firmware partitions and merged binaries to CDN along with SHA256 checksums
 inputs:
-  cf-bucket:
-    description: Name of the S3 bucket
+  bunny-stor-hostname:
+    description: Bunny SFTP Hostname
+    required: true
+  bunny-stor-username:
+    description: Bunny SFTP Username
+    required: true
+  bunny-stor-password:
+    description: Bunny SFTP Password
     required: true
   fw-version:
     description: Firmware version
@@ -43,10 +49,20 @@ runs:
         find . -type f -name '*.bin' -exec md5sum {} \; > hashes.md5.txt
         find . -type f -name '*.bin' -exec sha256sum {} \; > hashes.sha256.txt
 
-    - name: Upload artifacts to CDN
+    - name: Prepare Upload Folder
       shell: bash
       run: |
         mkdir -p upload
         mv *.bin upload/
         mv hashes.*.txt upload/
-        rclone copy upload 'cdn:${{ inputs.cf-bucket }}/${{ inputs.fw-version }}/${{ inputs.board }}/'
+
+    - name: Upload artifacts to CDN
+      uses: milanmk/actions-file-deployer@master
+      with:
+        remote-protocol: "sftp"
+        remote-host: "${{ inputs.bunny-stor-hostname }}"
+        remote-user: "${{ inputs.bunny-stor-username }}"
+        remote-password: "${{ inputs.bunny-stor-password }}"
+        remote-path: "/${{ inputs.fw-version }}/${{ inputs.board }}"
+        local-path: "upload"
+        sync: "full"

.github/actions/cdn-upload-version-info/action.yml

@@ -1,8 +1,14 @@
 name: cdn-upload-version-info
 description: Uploads version specific info to CDN
 inputs:
-  cf-bucket:
-    description: Name of the S3 bucket
+  bunny-stor-hostname:
+    description: Bunny SFTP Hostname
+    required: true
+  bunny-stor-username:
+    description: Bunny SFTP Username
+    required: true
+  bunny-stor-password:
+    description: Bunny SFTP Password
     required: true
   fw-version:
     description: Firmware version
@@ -17,14 +23,25 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Create boards.txt
+
+    - name: Prepare Upload Folder
       shell: bash
       run: |
-        echo -e '${{ inputs.boards }}' >> boards.txt
+        rm -rf upload/
+        mkdir -p upload/
 
-    - name: Upload artifacts to CDN
+    - name: Create boards.txt
       shell: bash
       run: |
-        mkdir -p upload
-        mv boards.txt upload/
-        rclone copy upload 'cdn:${{ inputs.cf-bucket }}/${{ inputs.fw-version }}/${{ inputs.board }}/'
+        echo -e '${{ inputs.boards }}' >> upload/boards.txt
+
+    - name: Upload artifacts to CDN
+      uses: milanmk/actions-file-deployer@master
+      with:
+        remote-protocol: "sftp"
+        remote-host: "${{ inputs.bunny-stor-hostname }}"
+        remote-user: "${{ inputs.bunny-stor-username }}"
+        remote-password: "${{ inputs.bunny-stor-password }}"
+        remote-path: "/${{ inputs.fw-version }}/"
+        local-path: "upload"
+        sync: "full"

.github/scripts/get-vars.js

@@ -1,8 +1,8 @@
-const fs = require('fs');
-const ini = require('ini');
-const semver = require('semver');
-const core = require('@actions/core');
-const child_process = require('child_process');
+import fs from 'fs';
+import ini from 'ini';
+import semver from 'semver';
+import core from '@actions/core';
+import child_process from 'child_process';
 
 // Get branch name
 const gitRef = process.env.GITHUB_REF;