Skip to content

Commit 33cc2d4

Browse files
committed
Updating dependencies to fix vulnerabilities in qs. (EpicGamesExt#770)
* Updating dependencies to fix vulnerabilities in qs. https://github.com/EpicGamesExt/PixelStreamingInfrastructure/security/dependabot/129 * Fixed tests docker using the pushed js-streamer rather than local. * fixing linting. (cherry picked from commit 2a43f9d) # Conflicts: # Extras/FrontendTests/package.json # Extras/JSStreamer/package.json # SignallingWebServer/package.json # package-lock.json
1 parent 09f53de commit 33cc2d4

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

Extras/FrontendTests/dockerfiles/linux/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
FROM node:20-bookworm
22

3+
WORKDIR /js-streamer
4+
COPY /Extras/JSStreamer .
5+
RUN npm install && npm run build
6+
37
WORKDIR /tester
48
COPY /Extras/FrontendTests .
9+
RUN npm link ../js-streamer
510

611
RUN npm install
712
RUN npx playwright install firefox

Extras/FrontendTests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@types/uuid": "^9.0.8"
1919
},
2020
"dependencies": {
21-
"@epicgames-ps/js-streamer": "^0.0.4",
21+
"@epicgames-ps/js-streamer": "^0.0.5",
2222
"@epicgames-ps/lib-pixelstreamingfrontend-ue5.6": "*",
2323
"dotenv": "^16.4.5",
2424
"node-fetch": "^2.7.0",

Extras/JSStreamer/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333
"typescript-eslint": "^8.24.0",
3434
"webpack": "^5.97.1",
3535
"webpack-cli": "^6.0.1",
36-
"webpack-dev-server": "^5.2.0",
36+
"webpack-dev-server": "^5.2.3",
3737
"webpack-node-externals": "^3.0.0"
3838
},
3939
"dependencies": {
4040
"@epicgames-ps/lib-pixelstreamingcommon-ue5.6": "*"
41+
"body-parser": "^1.20.4"
4142
},
4243
"overrides": {
4344
"http-proxy-middleware": "2.0.8"

Frontend/library/src/Config/Config.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ export class Config {
193193
settings && Object.prototype.hasOwnProperty.call(settings, TextParameters.SignallingServerUrl)
194194
? settings[TextParameters.SignallingServerUrl]
195195
: (location.protocol === 'https:' ? 'wss://' : 'ws://') +
196-
window.location.hostname +
197-
// for readability, we omit the port if it's 80
198-
(window.location.port === '80' || window.location.port === ''
199-
? ''
200-
: `:${window.location.port}`),
196+
window.location.hostname +
197+
// for readability, we omit the port if it's 80
198+
(window.location.port === '80' || window.location.port === ''
199+
? ''
200+
: `:${window.location.port}`),
201201
useUrlParams
202202
)
203203
);
@@ -649,7 +649,7 @@ export class Config {
649649
0 /*min*/,
650650
999 /*max*/,
651651
settings &&
652-
Object.prototype.hasOwnProperty.call(settings, NumericParameters.MaxReconnectAttempts)
652+
Object.prototype.hasOwnProperty.call(settings, NumericParameters.MaxReconnectAttempts)
653653
? settings[NumericParameters.MaxReconnectAttempts]
654654
: 3 /*value*/,
655655
useUrlParams
@@ -800,7 +800,7 @@ export class Config {
800800
500 /*min*/,
801801
900000 /*max*/,
802802
settings &&
803-
Object.prototype.hasOwnProperty.call(settings, NumericParameters.StreamerAutoJoinInterval)
803+
Object.prototype.hasOwnProperty.call(settings, NumericParameters.StreamerAutoJoinInterval)
804804
? settings[NumericParameters.StreamerAutoJoinInterval]
805805
: 3000 /*value*/,
806806
useUrlParams

Signalling/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
"typescript-eslint": "^8.24.0"
3636
},
3737
"dependencies": {
38-
"express": "^4.21.2",
39-
"express-rate-limit": "^7.5.0",
38+
"body-parser": "^1.20.4",
39+
"express": "^4.22.1",
40+
"express-rate-limit": "^8.2.1",
4041
"helmet": "^8.0.0",
4142
"hsts": "^2.2.0",
4243
"jsonc": "^2.0.0",

SignallingWebServer/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
},
3131
"dependencies": {
3232
"@epicgames-ps/lib-pixelstreamingsignalling-ue5.6": "*",
33+
"body-parser": "^1.20.4",
3334
"commander": "^12.0.0",
34-
"express": "^4.21.2",
35+
"express": "^4.22.1",
3536
"express-openapi": "^12.1.3",
3637
"jsonc": "^2.0.0"
3738
},

0 commit comments

Comments
 (0)