Merge remote-tracking branch 'origin/master' into Refactor

Author: Lord-Grey

.github/actions/download-pre-built-deps/action.yml

@@ -0,0 +1,64 @@
+name: Download Pre-Built Dependencies
+description: Download Pre-Built Dependencies for Hyperion to speed-up the CI build
+inputs:
+  os:
+    description: Operating System
+    required: true
+    default: 'debian_buster'
+  architecture:
+    description: Linux architecture
+    required: false
+    default: 'amd64'
+  qt_version:
+    description: Qt version
+    required: false
+    default: '6'
+  build_type:
+    type: string
+    description: Build type
+    default: ''
+outputs:
+  cmakeArgs:
+    description: "CMake arguments"
+    value: ${{ steps.download-pre-built-deps.outputs.cmake-args }}
+runs:
+  using: composite
+  steps:
+    - name: Download latest specs
+      uses: robinraju/release-downloader@v1
+      with:
+        repository: 'hyperion-project/hyperion-deps'
+        latest: true
+        fileName: 'buildspec.json'
+
+    - name: Download Deps
+      id: download-pre-built-deps
+      shell: bash
+      run: |
+        preBuiltDeps='buildspec.json'
+        baseURL=$(jq -r '.baseUrl' $preBuiltDeps)
+        version=$(jq -r '.version' $preBuiltDeps)
+        downloadHash=$(jq -r '.hashes .${{ inputs.os }} .${{ inputs.architecture }} .qt${{ inputs.qt_version }} .${{ inputs.build_type }}' $preBuiltDeps)
+        downloadFilename=${{ inputs.os }}-${{ inputs.architecture }}-qt${{ inputs.qt_version }}-${{ inputs.build_type }}-$version.tar.gz
+        echo 💾 Download "$downloadFilename"...
+        curl -OL "$baseURL"/"$version"/"$downloadFilename"
+        if [[ ${{ inputs.os }} == 'windows' ]]; then
+          computedHash=$(powershell -Command "(Get-FileHash -Path \"$downloadFilename\" -Algorithm SHA256).Hash.ToLower()")
+          destDir=C:/tmp
+        else
+          computedHash=$(sha256sum "$downloadFilename" | awk '{print $1}')
+          destDir=/tmp/deps
+        fi
+        echo 👀 Check Hash...
+        if [[ "$computedHash" == "$downloadHash" ]]; then
+          mkdir "$destDir"
+          tar -xzf "$downloadFilename" -C "$destDir"
+          if [[ ${{ inputs.os }} != 'windows' ]]; then
+            chmod +x "$destDir"/bin/*
+          fi
+          echo ✅ Hash check passed.
+          echo "cmake-args="-DUSE_PRE_BUILT_DEPS=ON -DPRE_BUILT_DEPS_DIR=$destDir"" >> $GITHUB_OUTPUT
+        else
+          echo ❌ Hash check failed.
+          echo "cmake-args=" >> $GITHUB_OUTPUT
+        fi

.github/workflows/codeql.yml

@@ -2,7 +2,7 @@ name: 📊 CodeQL
 run-name: |
   ${{ github.event_name == 'schedule' && '⏰ Scheduled CodeQL run' || '' }}
   ${{ github.event_name == 'push' && format('📊 Pushed CodeQL run - {0}', github.event.head_commit.message) || '' }}
-  ${{ github.event_name == 'pull_request' && format('📊 CodeQL run for PR {0} - {1}', github.event.pull_request.number, github.event.pull_request.title) || github.event.head_commit.message }}
+  ${{ github.event_name == 'pull_request' && format('📊 CodeQL run for PR {0} - {1}', github.event.pull_request.number, github.event.pull_request.title) || '' }}
 
 on:
   push:
@@ -26,33 +26,49 @@ jobs:
       matrix:
         language: [ python, javascript, cpp ]
 
+    container:
+      image: ghcr.io/hyperion-project/debian:bullseye-qt6
+
     steps:
       - name: ⬇ Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: 📥 Install Packages (cpp)
-        if: ${{ matrix.language == 'cpp' }}
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes git build-essential qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev 
-
-      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.28.3'          
-
       - name: 🔁 Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
           config-file: ./.github/config/codeql.yml
-          
-      - name: 👷 Autobuild
+
+      - name: 👷 Build (Python & JavaScript)
+        if: ${{ matrix.language != 'cpp' }}
         uses: github/codeql-action/autobuild@v3
 
+      - name: 📥 Install jq (C++)
+        if: ${{ matrix.language == 'cpp' }}
+        shell: bash
+        run: apt-get update && apt-get install -y jq
+
+      - name: 💾 Download Pre-Build Dependencies (C++)
+        if: ${{ matrix.language == 'cpp' }}
+        id: dependencies
+        uses: ./.github/actions/download-pre-built-deps
+        with:
+          os: 'debian_bullseye'
+          architecture: 'amd64'
+          qt_version: '6'
+          build_type: ${{ github.event_name == 'pull_request' && 'debug' || 'release' }}
+
+      - name: 👷 Build (C++)
+        if: ${{ matrix.language == 'cpp' }}
+        run: |
+          cmake --preset linux-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }}
+          cmake --build --preset linux-${{ env.BUILD_TYPE }}
+        env:
+          BUILD_TYPE: ${{ github.event_name == 'pull_request' && 'debug' || 'release' }}
+
       - name: 🏃 Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:
@@ -66,9 +82,6 @@ jobs:
           patterns: |
             -**/dependencies/**
             -**/moc_*.cpp
-            -**/libsrc/flatbufserver/hyperion_request_generated.h
-            -**/libsrc/protoserver/message.pb.cc
-            -**/libsrc/protoserver/message.pb.h
           input: sarif-results/${{ matrix.language }}.sarif
           output: sarif-results/${{ matrix.language }}.sarif
 
@@ -83,4 +96,3 @@ jobs:
           name: ${{ matrix.language }}.sarif
           path: sarif-results
           retention-days: 1
-

.github/workflows/qt5_6.yml

@@ -66,24 +66,35 @@ jobs:
         shell: bash
         run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
-      - name: 👷 Build
+      - name: 💾 Download Pre-Build Dependencies
+        id: dependencies
+        uses: ./.github/actions/download-pre-built-deps
+        with:
+          os: ${{ matrix.os.distribution }}_${{ matrix.os.codename }}
+          architecture: ${{ matrix.os.architecture[0] }}
+          qt_version: ${{ inputs.qt_version }}
+          build_type: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+
+      - name: 👷 Build ${{ env.HINT }}
         shell: bash
         run: |
           mkdir deploy
           docker run --rm --platform=${{ matrix.os.architecture[1] }} ${{ env.ENTRYPOINT }} \
             -v "${{ github.workspace }}/deploy:/deploy" \
             -v "${{ github.workspace }}:/source:rw" \
+            -v "/tmp/deps:/tmp/deps:rw" \
             -w "/source" \
             ghcr.io/hyperion-project/${{ env.DOCKER_IMAGE }}:${{ env.DOCKER_TAG }} \
-            /bin/bash -c "cmake --preset linux-${{ env.BUILD_TYPE }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
-            cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package --parallel $(nproc) &&
+            /bin/bash -c "cmake --preset linux-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
+            cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package &&
             cp /source/build/Hyperion-* /deploy/ 2>/dev/null"
         env:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
           ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
           CPACK_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
+          HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}
@@ -120,34 +131,34 @@ jobs:
       - name: 📥 Install dependencies
         uses: tecolicom/actions-use-homebrew-tools@v1
         with:
-          tools: qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi
+          tools: qt@${{ inputs.qt_version }} vulkan-headers coreutils
           key: ${{ runner.os }}-${{ matrix.architecture }}-homebrew-packages-${{ inputs.qt_version }}
 
-      - name: 👷 Build
+      - name: 💾 Download Pre-Build Dependencies
+        id: dependencies
+        uses: ./.github/actions/download-pre-built-deps
+        with:
+          os: 'macos'
+          architecture: ${{ matrix.architecture }}
+          qt_version: ${{ inputs.qt_version }}
+          build_type: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+
+      - name: 👷 Build ${{ env.HINT }}
         shell: bash
         run: |
           # Remove once issue with Homebrew cache action is fixed
           brew reinstall --formula cmake
 
           # Build
-          cmake --preset macos-${{ env.BUILD_TYPE }}
-          cmake --build --preset macos-${{ env.BUILD_TYPE }} --parallel $(sysctl -n hw.ncpu)
-
+          cmake --preset macos-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }}
+          cmake --build --preset macos-${{ env.BUILD_TYPE }}
           # CPack workaround for macOS 13
-          attempt=0
-          max_attempts=5
-          while [ $attempt -lt $max_attempts ]; do
-            if cd build && cpack; then
-              echo "Package created successfully"
-              break
-            else
-              echo "Failed to create package, retrying..."
-              sleep 10
-            fi
-            attempt=$((attempt + 1))
-          done
+          echo killing...; sudo pkill -9 XProtect >/dev/null || true;
+          echo waiting...; while pgrep XProtect; do sleep 3; done;
+          cd build; cpack
         env:
           BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+          HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}
@@ -192,10 +203,12 @@ jobs:
           destination: .\installer\libjpeg-turbo.exe
           cache-key: libjpeg-turbo
 
-      - name: 📥 Install DirectX SDK & libjpeg-turbo
+      - name: 📥 Extract DirectX SDK & libjpeg-turbo
         run: |
-          cmd.exe /c start /wait .\installer\libjpeg-turbo.exe /S
-          cmd.exe /c start /wait .\installer\dxsdk-jun10.exe /U /F
+          7z x -aoa .\installer\dxsdk-jun10.exe DXSDK/Include DXSDK/Lib -oC:\
+          echo "DXSDK_DIR=C:\DXSDK" | Out-File -FilePath $env:GITHUB_ENV -Append
+          7z x -aoa .\installer\libjpeg-turbo.exe bin include lib -oC:\turbojpeg
+          echo "TURBOJPEG_DIR=C:\turbojpeg" | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: 📥 Install Vulkan SDK
         if: ${{ inputs.qt_version == '6' }}
@@ -217,13 +230,23 @@ jobs:
       - name: 🛠️ Setup MSVC
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: 👷 Build
+      - name: 💾 Download Pre-Build Dependencies
+        id: dependencies
+        uses: ./.github/actions/download-pre-built-deps
+        with:
+          os: 'windows'
+          architecture: 'x64'
+          qt_version: ${{ inputs.qt_version }}
+          build_type: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+
+      - name: 👷 Build ${{ env.HINT }}
         shell: cmd
         run: |
-           cmake --preset windows-${{ env.BUILD_TYPE }}
-           cmake --build --preset windows-${{ env.BUILD_TYPE }} --target package --parallel %NUMBER_OF_PROCESSORS%
+           cmake --preset windows-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }}
+           cmake --build --preset windows-${{ env.BUILD_TYPE }} --target package
         env:
           BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+          HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}

.gitignore

@@ -43,9 +43,6 @@ deploy/*
 # ccache/buildcache
 .*cache/
 
-# release-deps/debug-deps
-*-deps/
-
 # User defined CMake preset file.
 CMakeUserPresets.json
 

.gitmodules

@@ -14,4 +14,10 @@
 	url = https://github.com/nitroshare/qmdnsengine.git
 [submodule "dependencies/external/mbedtls"]
 	path = dependencies/external/mbedtls
-	url = ../../Mbed-TLS/mbedtls.git
+	url = https://github.com/Mbed-TLS/mbedtls.git
+[submodule "dependencies/external/hidapi"]
+	path = dependencies/external/hidapi
+	url = https://github.com/libusb/hidapi
+[submodule "dependencies/external/libusb-cmake"]
+	path = dependencies/external/libusb-cmake
+	url = https://github.com/libusb/libusb-cmake