fix(cpn): avoid deadlock when closing the simulator during boot

.github/workflows/companion.yml

@@ -8,27 +8,35 @@ on:
       - v*
     paths:
       - '.github/workflows/companion.yml'
+      - '.github/workflows/wasm_modules.yml'
       - '.github/actions/python_dependencies/**'
       - '.github/actions/wasi_sdk/**'
       - '.github/actions/build_companion/**'
       - 'companion/**'
+      - 'fw.json'
       - 'pyproject.toml'
       - 'tools/build-companion.sh'
       - 'tools/build-wasm-modules.sh'
+      - 'radio/src/targets/simu/CMakeLists.txt'
+      - 'radio/src/targets/simu/pch_std.h'
       - 'cmake/wasm/CMakeLists.txt'
       - 'cmake/FetchWamr.cmake'
       - 'cmake/wamr-*.patch'
 
   pull_request:
     paths:
       - '.github/workflows/companion.yml'
+      - '.github/workflows/wasm_modules.yml'
       - '.github/actions/python_dependencies/**'
       - '.github/actions/wasi_sdk/**'
       - '.github/actions/build_companion/**'
       - 'companion/**'
+      - 'fw.json'
       - 'pyproject.toml'
       - 'tools/build-companion.sh'
       - 'tools/build-wasm-modules.sh'
+      - 'radio/src/targets/simu/CMakeLists.txt'
+      - 'radio/src/targets/simu/pch_std.h'
       - 'cmake/wasm/CMakeLists.txt'
       - 'cmake/FetchWamr.cmake'
       - 'cmake/wamr-*.patch'
@@ -49,58 +57,8 @@ on:
 
 jobs:
   modules:
-    name: WASM Modules (${{ matrix.group.id }})
-    runs-on: macos-15
-    strategy:
-      matrix:
-        group:
-          - id: color-1
-            target: [nv14, el18, pl18, pl18ev]
-          - id: color-2
-            target: [pl18u, t15, t16, t18, t22]
-          - id: bw-1
-            target: [zorro, pocket, commando8, tprov2, tpros, bumblebee, t14]
-          - id: bw-2
-            target: [mt12, gx12, t20, t20v2, t12max, tx12mk2, boxer]
-          - id: color-3
-            target: [tx15, tx16s, x12s, f16]
-          - id: mixed-1
-            target: [v12, v14, v14lcd, v15, v16, x10, x10express]
-          - id: bw-3
-            target: [x7access, x9dp2019, x9e]
-          - id: color-4
-            target: [nb4p, st16, pa01, c14]
-          - id: color-5
-            target: [t15pro, tx16smk3, gx15, h17, t15h7]
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v7
-        with:
-          submodules: true
-
-      - name: Setup Python Dependencies
-        uses: ./.github/actions/python_dependencies
-
-      - name: Setup WASI SDK
-        uses: ./.github/actions/wasi_sdk
-
-      - name: Build modules
-        shell: bash
-        env:
-          FLAVOR: ${{ join(matrix.group.target, ';') }}
-          CMAKE_BUILD_TYPE: 'Release'
-        run: |
-          mkdir output && \
-          tools/build-wasm-modules.sh "$(pwd)" "$(pwd)/output/"
-
-      - name: Archive production artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: wasm-modules-${{ matrix.group.id }}
-          path:  ${{github.workspace}}/output
-          if-no-files-found: error
-          retention-days: 15
+    name: Modules
+    uses: ./.github/workflows/wasm_modules.yml
 
   build-linux:
     name: Linux Companion

.github/workflows/validate_includes.yml

@@ -0,0 +1,24 @@
+---
+name: Validate includes
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    branches:
+      - 'main'
+  workflow_dispatch:
+
+# No 'paths' filter: any source edit can add an include. Pure stdlib, runs in
+# about a second.
+
+jobs:
+  validate:
+    name: Includes
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+
+      - name: Check that edgetx.h does not spread
+        run: python3 tools/check_includes.py

.github/workflows/wasm_modules.yml

@@ -0,0 +1,72 @@
+name: WASM Modules
+
+# Builds one simulator module per target in fw.json and uploads them as
+# wasm-modules-* artifacts. Shared by the Companion and web simulator workflows.
+on:
+  workflow_call:
+
+env:
+  # Each group takes one runner
+  GROUPS_COUNT: 9
+
+jobs:
+  plan:
+    name: Plan WASM module groups
+    runs-on: ubuntu-latest
+    outputs:
+      groups: ${{ steps.groups.outputs.groups }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+
+      - name: Split fw.json targets into groups
+        id: groups
+        shell: bash
+        run: |
+          groups=$(jq -c --argjson n "${GROUPS_COUNT}" '
+            [.targets[][1] | rtrimstr("-")] as $t
+            | [range($n) as $i
+               | {id: "group-\($i + 1)",
+                  target: [range($i; $t | length; $n) as $j | $t[$j]]}]
+            | map(select(.target | length > 0))
+          ' fw.json)
+          echo "groups=${groups}" >> "$GITHUB_OUTPUT"
+
+  modules:
+    name: WASM Modules (${{ matrix.group.id }})
+    needs: plan
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        group: ${{ fromJSON(needs.plan.outputs.groups) }}
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+        with:
+          submodules: true
+
+      - name: Setup Python Dependencies
+        uses: ./.github/actions/python_dependencies
+
+      - name: Setup WASI SDK
+        uses: ./.github/actions/wasi_sdk
+        with:
+          arch: x86_64-linux
+
+      - name: Build modules
+        shell: bash
+        env:
+          FLAVOR: ${{ join(matrix.group.target, ';') }}
+          CMAKE_BUILD_TYPE: 'Release'
+        run: |
+          mkdir output && \
+          tools/build-wasm-modules.sh "$(pwd)" "$(pwd)/output/"
+
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: wasm-modules-${{ matrix.group.id }}
+          path:  ${{github.workspace}}/output
+          if-no-files-found: error
+          retention-days: 15

.github/workflows/web_simulator.yml

@@ -0,0 +1,156 @@
+name: Web Simulator
+
+on:
+  schedule:
+    - cron: '0 3 * * *' # run at 3 AM UTC
+  pull_request:
+    paths:
+      - '.github/workflows/web_simulator.yml'
+      - 'web/**'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+env:
+  NODE_VERSION: '22'
+
+jobs:
+  check:
+    name: Check web build
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+
+      - name: Setup Node
+        uses: actions/setup-node@v7
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: npm
+          cache-dependency-path: web/package-lock.json
+
+      - name: Build
+        working-directory: web
+        run: |
+          npm ci
+          npm run build
+
+  modules:
+    name: Modules
+    # Repositories synced from this one get the schedule too
+    if: github.event_name != 'pull_request' && github.repository == 'EdgeTX/edgetx'
+    uses: ./.github/workflows/wasm_modules.yml
+
+  build:
+    name: Build site
+    needs: modules
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+
+      - name: Setup Node
+        uses: actions/setup-node@v7
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: npm
+          cache-dependency-path: web/package-lock.json
+
+      - name: Download WASM modules
+        uses: actions/download-artifact@v8
+        with:
+          pattern: wasm-modules-*
+          path: wasm-modules
+          merge-multiple: true
+
+      # The artifacts also contain build logs, which must not be published
+      - name: Copy WASM modules
+        run: cp wasm-modules/*.wasm web/public/
+
+      - name: Check that every radio has a module
+        shell: bash
+        run: |
+          missing=0
+          while read -r module; do
+            if [[ ! -f "web/public/${module}" ]]; then
+              echo "::error::Missing module ${module}"
+              missing=1
+            fi
+          done < <(jq -r '.[].wasm' web/public/radios.json)
+          exit "${missing}"
+
+      - name: Build
+        working-directory: web
+        run: |
+          npm ci
+          npm run build
+
+      # Before the deploy job, which only runs if this one succeeds
+      - name: Start every radio
+        working-directory: web
+        run: |
+          npx playwright-core install --with-deps chromium
+          npm run smoke-test
+
+      - name: Archive site
+        uses: actions/upload-artifact@v7
+        with:
+          name: web-simulator-dist
+          path: web/dist
+          if-no-files-found: error
+          retention-days: 3
+
+  # Separate from the build, so that the Cloudflare token is only available to
+  # wrangler. The environment only accepts runs from the deployed branches.
+  deploy:
+    name: Deploy site
+    needs: build
+    runs-on: ubuntu-latest
+    environment: web-simulator
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@v7
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install wrangler
+        working-directory: web
+        run: npm ci --ignore-scripts
+
+      - name: Download site
+        uses: actions/download-artifact@v8
+        with:
+          name: web-simulator-dist
+          path: web/dist
+
+      - name: Deploy
+        id: deploy
+        working-directory: web
+        shell: bash
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        run: |
+          npx wrangler deploy | tee "${RUNNER_TEMP}/deploy.log"
+          url=$(grep -oE 'https://[^ ]+\.workers\.dev' "${RUNNER_TEMP}/deploy.log" | head -n 1)
+          if [[ -z "${url}" ]]; then
+            echo "::error::Could not find the deployed URL in the wrangler output"
+            exit 1
+          fi
+          echo "url=${url}" >> "$GITHUB_OUTPUT"
+
+      - name: Check deployed site
+        env:
+          SITE_URL: ${{ steps.deploy.outputs.url }}
+        run: node web/scripts/check-deployment.js "${SITE_URL}"

companion/src/CMakeLists.txt

@@ -136,10 +136,19 @@ endif()
 ############# Import radio hardware definitions ###############
 
 set(HWDEFS_DIR "${CMAKE_SOURCE_DIR}/radio/src/boards/hw_defs")
-set(HWDEFS_TMPL "${COMPANION_SRC_DIRECTORY}/hwdefs.qrc.in")
-set(HWDEFS_PHDR "HWDEF_JSON_LIST")
 set(HWDEFS_QRC "${CMAKE_CURRENT_BINARY_DIR}/hwdefs.qrc")
-set(HWDEFS_CMD "${COMPANION_SRC_DIRECTORY}/../util/generate_hwdefs_qrc.py")
+
+# CONFIGURE_DEPENDS re-runs the glob on each build, so adding or removing
+# a definition regenerates the qrc in an existing build folder
+file(GLOB HWDEF_JSON_FILES CONFIGURE_DEPENDS "${HWDEFS_DIR}/*.json")
+list(SORT HWDEF_JSON_FILES)
+set(HWDEF_JSON_ENTRIES "")
+foreach(json_file ${HWDEF_JSON_FILES})
+  get_filename_component(json_file_name ${json_file} NAME)
+  list(APPEND HWDEF_JSON_ENTRIES "    <file alias=\"${json_file_name}\">${json_file}</file>")
+endforeach()
+list(JOIN HWDEF_JSON_ENTRIES "\n" HWDEF_JSON_LIST)
+configure_file(${COMPANION_SRC_DIRECTORY}/hwdefs.qrc.in ${HWDEFS_QRC} @ONLY)
 
 ############# Common lib ###############
 
@@ -158,16 +167,6 @@ set(common_MOC_HDRS
 
 qt_wrap_cpp(common_SRCS ${common_MOC_HDRS})
 
-# qrc used by Companion and Simulator
-add_custom_command(OUTPUT ${HWDEFS_QRC}
-  COMMAND ${PYTHON_EXECUTABLE} ${HWDEFS_CMD}
-      -d ${HWDEFS_DIR}
-      -t ${HWDEFS_TMPL}
-      -p ${HWDEFS_PHDR}
-      -o ${HWDEFS_QRC}
-  DEPENDS ${HWDEFS_TMPL}
-)
-
 set(common_RESOURCES
   companion.qrc
   ${TRANSLATIONS_QRC}