Merge branch 'master' into capture-time

Author: lukehb

.github/workflows/create-gh-release.yml

@@ -6,30 +6,41 @@ on:
     paths: ['RELEASE_VERSION']
 
   workflow_dispatch:
-      inputs:
-        commitsha:
-          description: "Commit SHA for the release (if blank use latest on this branch)"
+    inputs:
+      commitsha:
+        description: "Commit SHA for the release (if blank use latest on this branch)"
 
 env:
   commitsha: "${{ github.event.inputs.commitsha || github.sha }}"
 
 jobs:
-
   build:
+    # only run this on the main repo, not forks
     if: github.repository == 'EpicGamesExt/PixelStreamingInfrastructure'
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./
-
     permissions:
       contents: write
+
     steps:
     - name: "Checkout source code"
       uses: actions/checkout@v3
       with:
         ref: "${{ env.commitsha }}"
 
+      # triggers the public library check to make sure all the published items work
+    - uses: convictional/trigger-workflow-and-wait@v1.6.1
+      with:
+        owner: ${{ github.repository_owner }}
+        repo: PixelStreamingInfrastructure
+        ref: ${{ github.ref_name }}
+        github_user: ${{ secrets.WORKFLOW_USER }}
+        github_token: ${{ secrets.WORKFLOW_TOKEN }}
+        workflow_file_name: healthcheck-libs-with-public-deps.yml
+        client_payload: '{ "commitsha": "${{ env.commitsha }}" }'
+
     - name: Read the RELEASE_VERSION file
       id: getversion
       run: echo "version=$(cat RELEASE_VERSION)" >> $GITHUB_OUTPUT
@@ -90,7 +101,7 @@ jobs:
           Signalling/node_modules
           SignallingWebServer/build
           SignallingWebServer/node_modules
-          SS_Test
+          Extras/SS_Test
 
     - name: Archive Release .zip
       uses: thedoctor0/zip-release@0.7.1
@@ -124,7 +135,6 @@ jobs:
           /*/Signalling/node_modules/*
           /*/SignallingWebServer/build/*
           /*/SignallingWebServer/node_modules/*
-          /*/SS_Test/*
 
     - name: "Make the release"
       uses: ncipollo/release-action@v1

.github/workflows/healthcheck-libraries.yml

@@ -57,4 +57,8 @@ jobs:
 
     - name: Clean build of frontend implementation
       working-directory: Frontend/implementations/typescript
-      run: npm install && npm run build
+      run: npm install && npm run build
+
+    - name: Clean build of frontend implementation as ES6
+      working-directory: Frontend/implementations/typescript
+      run: npm install && npm run build:esm

.github/workflows/healthcheck-libs-with-public-deps.yml

@@ -2,104 +2,55 @@ name: Check health of libraries (public deps)
 
 on:
   workflow_dispatch:
-  push:
-    paths:
-      - "Common/**"
-      - "Signalling/**"
-      - "SignallingWebServer/**"
-      - "Frontend/library/**"
-      - "Frontend/ui-library/**"
-      - "Frontend/implementations/typescript/**"
-  pull_request:
-    paths:
-      - "Common/**"
-      - "Signalling/**"
-      - "SignallingWebServer/**"
-      - "Frontend/library/**"
-      - "Frontend/ui-library/**"
-      - "Frontend/implementations/typescript/**"
+    inputs:
+      commitsha:
+        description: "Commit SHA for the release (if blank use latest on this branch)"
 
 env:
+  commitsha: "${{ github.event.inputs.commitsha || github.sha }}"
   NODE_VERSION: 18.17.x
 
 jobs:
-  check-if-bypass:
-      runs-on: ubuntu-latest
-      outputs:
-        bypass: ${{ steps.checkbypass.outputs.bypass }}
-      steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 5  # This should be enough history to contain the commit that triggered the PR
-
-      - name: Grab PR body
-        if: github.event_name == 'pull_request'
-        env:
-          PR_BODY: ${{ github.event.pull_request.body }}
-        run: |
-          echo "BODY_CHECK<<EOF" >> $GITHUB_ENV
-          echo "$PR_BODY" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Grab commit message for push event
-        if: github.event_name == 'push'
-        env:
-          COMMIT: ${{ github.event.head_commit.message }}
-        run: |
-          echo "BODY_CHECK<<EOF" >> $GITHUB_ENV
-          echo "$COMMIT" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Check if the body to check contains the bypass tag
-        id: checkbypass
-        run: |
-          if echo "$BODY_CHECK" | grep -q "#bypass-publish-check"; then
-            echo "bypass=true" >> $GITHUB_OUTPUT
-            echo "bypass=true"
-          else
-            echo "bypass=false" >> $GITHUB_OUTPUT
-            echo "bypass=flase"
-          fi
-
   build-using-public-deps:
-      needs: check-if-bypass
-      if: github.repository == 'EpicGamesExt/PixelStreamingInfrastructure' && needs.check-if-bypass.outputs.bypass == 'false' # Only run if bypass is false
-      runs-on: ubuntu-latest
-      steps:
-
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "${{ env.NODE_VERSION }}"
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Remove NPM workspaces
-        run: rm package.json && rm package-lock.json
-
-      - name: Build signalling using published packages only
-        if: always()
-        working-directory: Signalling
-        run: npm install && npm run build && npm run lint
-
-      - name: Build Wilbur using published packages only
-        if: always()
-        working-directory: SignallingWebServer
-        run: npm install && npm run build && npm run lint
-
-      - name: Build Frontend/library using published packages only
-        if: always()
-        working-directory: Frontend/library
-        run: npm install && npm run build && npm run lint && npm run test
-
-      - name: Build Frontend/ui-library using published packages only
-        if: always()
-        working-directory: Frontend/ui-library
-        run: npm install && npm run build && npm run lint
+    if: github.repository == 'EpicGamesExt/PixelStreamingInfrastructure'
+    runs-on: ubuntu-latest
+    outputs:
+      continue: ${{ steps.set_output.outputs.continue }}
+    steps:
+    - name: Checkout source code
+      uses: actions/checkout@v3
+      with:
+        ref: "${{ env.commitsha }}"
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: "${{ env.NODE_VERSION }}"
+        registry-url: 'https://registry.npmjs.org'
+
+    - name: Remove NPM workspaces
+      run: rm package.json && rm package-lock.json
+
+    - name: Build signalling using published packages only
+      if: always()
+      working-directory: Signalling
+      run: npm install && npm run build && npm run lint
+    - name: Build Wilbur using published packages only
+      if: always()
+      working-directory: SignallingWebServer
+      run: npm install && npm run build && npm run lint
+    - name: Build Frontend/library using published packages only
+      if: always()
+      working-directory: Frontend/library
+      run: npm install && npm run build && npm run lint && npm run test
+    - name: Build Frontend/ui-library using published packages only
+      if: always()
+      working-directory: Frontend/ui-library
+      run: npm install && npm run build && npm run lint
+    - name: Build Frontend/implementations/typescript using published packages only
+      if: always()
+      working-directory: Frontend/implementations/typescript
+      run: npm install && npm run build
+
+    - id: set_output
+      run: echo "continue=true" >> $GITHUB_ENV
 
-      - name: Build Frontend/implementations/typescript using published packages only
-        if: always()
-        working-directory: Frontend/implementations/typescript
-        run: npm install && npm run build

.github/workflows/healthcheck-signalling-protocol.yml

@@ -7,13 +7,13 @@ on:
       - "Common/**"
       - "Signalling/**"
       - "SignallingWebServer/**"
-      - "SS_Test/**"
+      - "Extras/SS_Test/**"
   pull_request:
     paths:
       - "Common/**"
       - "Signalling/**"
       - "SignallingWebServer/**"
-      - "SS_Test/**"
+      - "Extras/SS_Test/**"
 
 jobs:
   signalling-protocol-test:
@@ -26,6 +26,6 @@ jobs:
     - name: Launch signalling tests in docker containers
       uses: isbang/compose-action@v1.5.1
       with:
-        compose-file: "SS_Test/docker-compose.yml"
+        compose-file: "Extras/SS_Test/docker-compose.yml"
         up-flags: "--build --abort-on-container-exit --exit-code-from tester"
 

.github/workflows/publish-signalling-library-to-npm.yml

@@ -32,7 +32,7 @@ jobs:
 
       - id: get-package-json
         run: |
-          package_content=`cat Signalling/package.json`
+          package_content=`cat package.json`
           echo "json<<EOF" >> $GITHUB_OUTPUT
           echo $package_content >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT

.gitignore

@@ -8,4 +8,6 @@ SignallingWebServer/Public/
 SignallingWebServer/certificates
 .vscode
 coverage/
-common/types/*
+common/types/*
+.nx/cache
+.nx/workspace-data

.lintstagedrc.mjs

@@ -0,0 +1,3 @@
+export default {
+    "*.json": "prettier --write"
+}

Common/.prettierrc.json .prettierrc.jsonCommon/.prettierrc.json renamed to .prettierrc.json

@@ -49,7 +49,7 @@ If you have a solution to a problem you've encountered or to any other open issu
  - All TypeScript should adhere to the following [linting rules](https://github.com/EpicGamesExt/PixelStreamingInfrastructure/blob/master/Frontend/library/.eslintrc.js).
  - Names should follow US English spelling.
  - All public functions/API should have comments.
- - Code formatting should adhere to the following [whitespace and indentation rules](https://github.com/EpicGamesExt/PixelStreamingInfrastructure/blob/master/Frontend/library/.prettierrc.json).
+ - Code formatting should adhere to the following [whitespace and indentation rules](https://github.com/EpicGamesExt/PixelStreamingInfrastructure/blob/master/.prettierrc.json).
  - All new features should have accompanying unit tests and documentation when they are submitted.
  - Prefer early returns in `if` statements to decrease indentation.
  - Prefer functions to not exceed ~20 lines.
@@ -65,4 +65,4 @@ Documentation should be broken up into separate `.md` files per directory, ideal
 
 ## Legal
 
-© 2004-2024, Epic Games, Inc. Unreal and its logo are Epic’s trademarks or registered trademarks in the US and elsewhere.
+© 2004-2025, Epic Games, Inc. Unreal and its logo are Epic’s trademarks or registered trademarks in the US and elsewhere.

CONTRIBUTING.md

@@ -3,7 +3,10 @@
 module.exports = {
     root: true,
     parser: '@typescript-eslint/parser',
-    parserOptions: { project: './tsconfig.esm.json' },
+    parserOptions: {
+        project: './tsconfig.cjs.json',
+        tsconfigRootDir: __dirname,
+    },
     plugins: [
         '@typescript-eslint',
         'eslint-plugin-tsdoc',