Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to master #286

Merged
merged 132 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
40756f7
Disable fullscreen button on IPhone as fullscreen API does not work o…
lukehb Jul 28, 2024
945ef6c
Merge pull request #221 from EpicGamesExt/UE5.5
lukehb Aug 1, 2024
61ce2c0
Merge pull request #214 from EpicGamesExt/fix-fullscreen-iphone
mcottontensor Aug 1, 2024
9822417
Updating container tags to 5.5
mcottontensor Aug 7, 2024
c9e33a4
Adding linux side of stream testing using software
mcottontensor Aug 7, 2024
f03065c
Update healthcheck-streaming.yml
mcottontensor Aug 7, 2024
303d54c
Update healthcheck-streaming.yml
mcottontensor Aug 7, 2024
2c09498
Fixing windows results path
mcottontensor Aug 7, 2024
52ff604
Fixing windows sha output variable
mcottontensor Aug 7, 2024
9063dd2
Extending the wait time of the stream test to see if it affects linux…
mcottontensor Aug 7, 2024
821b371
Should only run on main repo.
mcottontensor Aug 7, 2024
08ba34b
updating the streamer image location
mcottontensor Aug 7, 2024
be08935
fixed typo
mcottontensor Aug 7, 2024
a1c9fba
Adding dockerfiles and scripts to help build the software rendering d…
mcottontensor Aug 8, 2024
c647245
Merge pull request #233 from mcottontensor/linux-stream-test
mcottontensor Aug 8, 2024
01d6ed2
Bump react implementation and dependency version
Belchy06 Aug 11, 2024
8c7fdb7
Merge branch 'master' of https://github.com/EpicGamesExt/PixelStreami…
Belchy06 Aug 11, 2024
16db10f
Merge pull request #237 from Belchy06/version
mcottontensor Aug 11, 2024
024df05
Merge pull request #235 from rishi23root/patch-1
mcottontensor Aug 11, 2024
74ca3d0
Set default inline style for hidden input
Belchy06 Aug 11, 2024
e7a6dc4
Merge pull request #238 from Belchy06/default-style
mcottontensor Aug 12, 2024
756fc99
Adding signalling lib as a dep to the signalling server.
mcottontensor Aug 12, 2024
6b8eab8
Add support for sending all browser's supported codecs, not just the …
lukehb Aug 15, 2024
2297868
Change --no-save to --save. Also commit default config.json file.
lukehb Aug 16, 2024
b74a1d3
Add config.json back into .gitignore so changed values during dev are…
lukehb Aug 16, 2024
4b20788
Update the docs with --save and mention config.json is not saved by d…
lukehb Aug 16, 2024
3f3d628
Add logging about streamer disconnecting
lukehb Aug 20, 2024
af4ebfc
Merge pull request #244 from EpicGamesExt/streamer-disconnect
lukehb Aug 20, 2024
1a4f819
Add support for configurable countdown value for AFKTimeout
pr0g Aug 21, 2024
6f30546
Merge pull request #240 from EpicGamesExt/restore_no_save
mcottontensor Aug 23, 2024
6cadad9
Merge pull request #248 from EpicGamesExt/flexfec
mcottontensor Aug 23, 2024
efbbb22
Merge pull request #247 from revu-design/configure-count-down-afk
mcottontensor Aug 23, 2024
cf054f8
Adding prettier to the linter rules. Ran prettier over all of frontend.
mcottontensor Aug 27, 2024
1313fbf
Merge pull request #253 from mcottontensor/prettier-lint
mcottontensor Aug 27, 2024
d6018b2
Add configuration option to enable VP9 for the SFU. Mediasoup only su…
Belchy06 Aug 13, 2024
c310bb4
Remove check for send only media direction. This was disabling audio …
Belchy06 Aug 13, 2024
1fc3a09
Add support for receiving scalability mode in the offer
Belchy06 Aug 20, 2024
e3b6052
Restore subscribeStreamerId default value
Belchy06 Aug 28, 2024
b55de1c
Add functionality to send webcam back to UE
Belchy06 Aug 26, 2024
a065ede
Docs update
Belchy06 Aug 26, 2024
f61f99f
Move audio/video sender setup into separate functions
Belchy06 Aug 26, 2024
de66af7
Merge pull request #258 from Belchy06/svc
mcottontensor Aug 28, 2024
b2538df
Bringing keypress events in line with up/down events. re keyCode vs c…
mcottontensor Aug 29, 2024
c6c0d1e
Merge pull request #260 from mcottontensor/press_event_fix
mcottontensor Aug 29, 2024
2d4d298
Ran prettier over Common src
mcottontensor Aug 29, 2024
ae8d507
Ran prettier over Signalling src
mcottontensor Aug 29, 2024
f999717
Ran prettier over SignallingWebServer src
mcottontensor Aug 29, 2024
55fbffa
Adding a certs ignore just to prevent ssl certs from being committed
mcottontensor Aug 29, 2024
688b5d3
Merge pull request #261 from mcottontensor/prettier-more
mcottontensor Aug 29, 2024
db6de97
Bump the npm_and_yarn group across 5 directories with 1 update
dependabot[bot] Aug 29, 2024
44cb01e
Fixing linting issues
mcottontensor Aug 29, 2024
246af1b
Merge pull request #262 from EpicGamesExt/dependabot/npm_and_yarn/Com…
mcottontensor Aug 29, 2024
d7b6d2d
Updated the logger object to make more sense.
mcottontensor Aug 30, 2024
1f4f07f
Fixing up logger references in frontend library
mcottontensor Aug 30, 2024
ce79707
Fixing up logger references in frontend ui-library
mcottontensor Aug 30, 2024
b0c00c9
Updating frontend logging usage
mcottontensor Aug 30, 2024
6889608
Fixing linter issues
mcottontensor Aug 30, 2024
ff2aad8
Merge pull request #263 from mcottontensor/logging_cleanup
mcottontensor Sep 2, 2024
7b2cf42
Initial working JS streamer.
mcottontensor Aug 14, 2024
7167b44
Working on datachannel message implementation.
mcottontensor Aug 15, 2024
6251c18
Somewhat working datachannel messages in both directions
mcottontensor Aug 16, 2024
a4cc4a9
Separating out the streamer into its own file. Cleaning up and adding…
mcottontensor Aug 19, 2024
463dfa2
Continuing to clean up and add more callbacks.
mcottontensor Aug 19, 2024
b04de68
Adding a qp report.
mcottontensor Aug 21, 2024
27eaef6
Fixing handling of strings in datachannel
mcottontensor Aug 21, 2024
9c211fc
Bunch of work toward recording and validating data channel messages
mcottontensor Aug 23, 2024
63ded8d
Cleaning up and testing
mcottontensor Aug 26, 2024
f33b80c
Validating mouse movements on locked input
mcottontensor Aug 28, 2024
c7dc0c8
Fixing string reading
mcottontensor Aug 28, 2024
bb20b94
Cleaning up and sorting functionality
mcottontensor Aug 28, 2024
11aff17
Fixing movement test with chrome. More cleanup
mcottontensor Aug 28, 2024
633146c
hovering and locked mouse tests
mcottontensor Aug 28, 2024
612c320
Basic keyboard event test
mcottontensor Aug 29, 2024
1b045d5
Resolution change message test
mcottontensor Aug 29, 2024
6e5b7fe
Tweaking readme
mcottontensor Aug 29, 2024
a6ca775
Fixing small issue with key iteration
mcottontensor Aug 29, 2024
80489b6
Merging several tests into single files
mcottontensor Aug 29, 2024
1c7d4d0
Adding and running linting
mcottontensor Aug 30, 2024
f7592c6
Moved Streamer to Extras/JSStreamer
mcottontensor Sep 2, 2024
8821116
Moved frontend tests to Extras/FrontendTests
mcottontensor Sep 2, 2024
6c0b8fd
Adding frontend lib as a dep
mcottontensor Sep 2, 2024
5464b01
Updating package details
mcottontensor Sep 2, 2024
f0a27c5
Updating imports
mcottontensor Sep 2, 2024
2e2b7bd
Fixing linting issues
mcottontensor Sep 2, 2024
3cffe48
FrontendTests now uses the epicgames-ps/js-streamer package
mcottontensor Sep 2, 2024
46b0843
Adding tsc to the build process
mcottontensor Sep 2, 2024
9b7e433
Changing underscores to camel case
mcottontensor Sep 2, 2024
2a73fea
Updating some more camel case
mcottontensor Sep 2, 2024
c088633
Camel case conversions.
mcottontensor Sep 2, 2024
e2d9f20
adding a small comment
mcottontensor Sep 2, 2024
290bced
Merge pull request #266 from mcottontensor/js-streamer
mcottontensor Sep 2, 2024
e5ba209
Bump webpack
dependabot[bot] Sep 2, 2024
ef20070
Merge pull request #267 from EpicGamesExt/dependabot/npm_and_yarn/Ext…
mcottontensor Sep 2, 2024
a0da3d9
Just cleaning up the JS Streamer landing page
mcottontensor Sep 2, 2024
35d24f3
Merge branch 'master' into Bidirectional-Video
Belchy06 Sep 2, 2024
1d6f3c3
Merge pull request #251 from Belchy06/Bidirectional-Video
mcottontensor Sep 2, 2024
33758f4
Fixed bad merge
mcottontensor Sep 2, 2024
ced81d6
Fixed linting
mcottontensor Sep 2, 2024
5841777
Faking mouse with touch is now once again false by default. Added the…
mcottontensor Sep 3, 2024
2f9f59c
Merge pull request #271 from mcottontensor/fix_fake_mouse
mcottontensor Sep 3, 2024
5056e5d
Removed reference to non existent pr
mcottontensor Sep 3, 2024
9a51444
Simplifying the coordinate converter
mcottontensor Sep 3, 2024
5de18d8
Renamed setup to configure since it can be called multiple times.
mcottontensor Sep 3, 2024
770c0f0
Cleaning up the mouse controller classes
mcottontensor Sep 4, 2024
1116366
Further cleaning up the mouse controllers
mcottontensor Sep 4, 2024
b024367
Cleaning up touch controllers
mcottontensor Sep 4, 2024
45ef1c0
Cleaning up gamepad and keyboard controllers.
mcottontensor Sep 4, 2024
06a2339
Small cleanup
mcottontensor Sep 4, 2024
191ca55
Just some renaming. Removed left behind HoveringMouseController
mcottontensor Sep 4, 2024
366947e
Linting
mcottontensor Sep 4, 2024
9d1064e
Exporting input translator so it can be used in tests.
mcottontensor Sep 5, 2024
0d937e8
Linting
mcottontensor Sep 5, 2024
ad22485
Cleaning up the various input controllers interfaces
mcottontensor Sep 5, 2024
5063d07
Updating some documentation comments
mcottontensor Sep 5, 2024
17be0da
Fixing gamepad button presses
mcottontensor Sep 5, 2024
12bb47b
Adding mouse movement tests for resizing the window
mcottontensor Sep 6, 2024
aa43030
Adding mouse wheel tests
mcottontensor Sep 6, 2024
be66850
Just making mouse tests more explicit with the settings
mcottontensor Sep 8, 2024
876b5b3
Fixing logger having multiple configurations
mcottontensor Sep 9, 2024
e1cc8ee
Adding min/max bitrate to answer message
mcottontensor Sep 9, 2024
b03d911
Updating proto docs
mcottontensor Sep 9, 2024
b9ec37e
Merge pull request #277 from mcottontensor/answer_update
mcottontensor Sep 9, 2024
91a21bb
Merge pull request #275 from mcottontensor/input_cleanup
mcottontensor Sep 10, 2024
db21e0c
Bump the npm_and_yarn group across 3 directories with 2 updates
dependabot[bot] Sep 10, 2024
4018e2f
Merge pull request #279 from EpicGamesExt/dependabot/npm_and_yarn/Ext…
mcottontensor Sep 10, 2024
b512c03
Update showcase stat buttons to also work with PS2
Belchy06 Sep 19, 2024
b96db92
Merge pull request #282 from EpicGamesExt/demo
mcottontensor Sep 19, 2024
b3e7c4c
ADD: Multiplex data channels with PS2
gingernaz Sep 20, 2024
1baabcb
Bump the npm_and_yarn group across 2 directories with 1 update
dependabot[bot] Sep 21, 2024
01650e8
[ADD] Add multiplex field to offer message and bump protocol version
gingernaz Sep 24, 2024
c7653a0
Merge pull request #284 from gingernaz/sfu-multiplex-data-channels
mcottontensor Sep 24, 2024
15ee191
Merge pull request #283 from EpicGamesExt/dependabot/npm_and_yarn/Fro…
mcottontensor Sep 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
tags: 'pixelstreamingunofficial/pixel-streaming-signalling-server:5.4'
tags: 'pixelstreamingunofficial/pixel-streaming-signalling-server:5.5'
push: true
file: SignallingWebServer/Dockerfile
-
name: Build and push the SFU container image
uses: docker/build-push-action@v3
with:
context: .
tags: 'pixelstreamingunofficial/pixel-streaming-sfu:5.4'
tags: 'pixelstreamingunofficial/pixel-streaming-sfu:5.5'
push: true
file: SFU/Dockerfile

38 changes: 34 additions & 4 deletions .github/workflows/healthcheck-streaming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,33 @@ on:
- "Extras/**"

jobs:
streaming-test:
streaming-test-linux:
if: github.repository == 'EpicGamesExt/PixelStreamingInfrastructure'
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v3

- name: Create results directory
run: mkdir Extras/MinimalStreamTester/results

- name: Launch stream test in docker containers
uses: isbang/[email protected]
with:
compose-file: "Extras/MinimalStreamTester/docker-compose.yml"
up-flags: "--build --abort-on-container-exit --exit-code-from tester"

- name: Get short sha
id: vars
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Upload results
uses: actions/upload-artifact@v4
with:
name: Results-${{ steps.vars.outputs.sha_short }}-Linux
path: Extras/MinimalStreamTester/results

streaming-test-win:
if: github.repository == 'EpicGamesExt/PixelStreamingInfrastructure'
runs-on: windows-latest
steps:
Expand Down Expand Up @@ -108,8 +134,12 @@ jobs:
$Env:PIXELSTREAMING_URL = 'http://localhost:999'
npx playwright test

- name: Upload screenshot
- name: Get short sha
id: vars
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $Env:GITHUB_OUTPUT

- name: Upload results
uses: actions/upload-artifact@v4
with:
name: Screenshot
path: Extras\MinimalStreamTester\StreamResult.png
name: Results-${{ steps.vars.outputs.sha_short }}-Win
path: Extras\MinimalStreamTester\playwright-report
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ As a reminder each UE-X branch/tag in this repository corresponds to a version o
- Bumped passport from 0.4.1 to 0.6.0 in /SignallingWebServer by @dependabot in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/71
- Bumped engine.io and socket.io in /Matchmaker by @dependabot in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/72
- Bumped socket.io-parser from 4.2.2 to 4.2.4 in /Matchmaker by @dependabot in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/244
- Patched Uncaught exception in PixelStreamingInfrastructure via engine by @imhunterand in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/61
- Fixed insufficient validation when decoding a Socket packet by @iot-defcon
- @ CVE-2022-25896 by @mik-patient in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/35
- Bump webpack from 5.75.0 to 5.76.0 in /Frontend/library by @dependabot in https://github.com/EpicGames/PixelStreamingInfrastructure/pull/153
Expand Down
5 changes: 3 additions & 2 deletions Common/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ module.exports = {
parserOptions: { project: './tsconfig.esm.json' },
plugins: [
'@typescript-eslint',
'eslint-plugin-tsdoc'
'eslint-plugin-tsdoc',
],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended-type-checked'
'plugin:@typescript-eslint/recommended-type-checked',
"plugin:prettier/recommended",
],
rules: {
"tsdoc/syntax": "warn",
Expand Down
Binary file added Common/.prettierignore
Binary file not shown.
7 changes: 7 additions & 0 deletions Common/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"printWidth": 110,
"trailingComma": "none",
"tabWidth": 4,
"semi": true,
"singleQuote": true
}
2 changes: 2 additions & 0 deletions Common/docs/messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ an offer and the other should answer.
| type | [string](#string) | | Should always be 'answer' |
| sdp | [string](#string) | | The WebRTC SDP payload |
| playerId | [string](#string) | optional | If being sent to a player this should be set to a valid player ID. |
| minBitrateBps | [int32](#int32) | optional | Specifies the minimum bitrate requested for streams. |
| maxBitrateBps | [int32](#int32) | optional | Specifies the maximum bitrate requested for streams. |



Expand Down
Loading
Loading