Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Extras/FrontendTests/dockerfiles/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM node:20-bookworm

WORKDIR /js-streamer
COPY /Extras/JSStreamer .
RUN npm install && npm run build

WORKDIR /tester
COPY /Extras/FrontendTests .
RUN npm link ../js-streamer

RUN npm install
RUN npx playwright install firefox
Expand Down
2 changes: 1 addition & 1 deletion Extras/FrontendTests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/uuid": "^9.0.8"
},
"dependencies": {
"@epicgames-ps/js-streamer": "^0.0.4",
"@epicgames-ps/js-streamer": "^0.0.5",
"@epicgames-ps/lib-pixelstreamingfrontend-ue5.7": "*",
"dotenv": "^16.4.5",
"node-fetch": "^2.7.0",
Expand Down
5 changes: 3 additions & 2 deletions Extras/JSStreamer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
"typescript-eslint": "^8.24.0",
"webpack": "^5.97.1",
"webpack-cli": "^6.0.1",
"webpack-dev-server": "^5.2.0",
"webpack-dev-server": "^5.2.3",
"webpack-node-externals": "^3.0.0"
},
"dependencies": {
"@epicgames-ps/lib-pixelstreamingcommon-ue5.7": "*"
"@epicgames-ps/lib-pixelstreamingcommon-ue5.7": "*",
"body-parser": "^1.20.4"
},
"overrides": {
"http-proxy-middleware": "2.0.8"
Expand Down
14 changes: 7 additions & 7 deletions Frontend/library/src/Config/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ export class Config {
settings && Object.prototype.hasOwnProperty.call(settings, TextParameters.SignallingServerUrl)
? settings[TextParameters.SignallingServerUrl]
: (location.protocol === 'https:' ? 'wss://' : 'ws://') +
window.location.hostname +
// for readability, we omit the port if it's 80
(window.location.port === '80' || window.location.port === ''
? ''
: `:${window.location.port}`),
window.location.hostname +
// for readability, we omit the port if it's 80
(window.location.port === '80' || window.location.port === ''
? ''
: `:${window.location.port}`),
useUrlParams
)
);
Expand Down Expand Up @@ -649,7 +649,7 @@ export class Config {
0 /*min*/,
999 /*max*/,
settings &&
Object.prototype.hasOwnProperty.call(settings, NumericParameters.MaxReconnectAttempts)
Object.prototype.hasOwnProperty.call(settings, NumericParameters.MaxReconnectAttempts)
? settings[NumericParameters.MaxReconnectAttempts]
: 3 /*value*/,
useUrlParams
Expand Down Expand Up @@ -800,7 +800,7 @@ export class Config {
500 /*min*/,
900000 /*max*/,
settings &&
Object.prototype.hasOwnProperty.call(settings, NumericParameters.StreamerAutoJoinInterval)
Object.prototype.hasOwnProperty.call(settings, NumericParameters.StreamerAutoJoinInterval)
? settings[NumericParameters.StreamerAutoJoinInterval]
: 3000 /*value*/,
useUrlParams
Expand Down
5 changes: 3 additions & 2 deletions Signalling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@
"typescript-eslint": "^8.24.0"
},
"dependencies": {
"express": "^4.21.2",
"express-rate-limit": "^7.5.0",
"body-parser": "^1.20.4",
"express": "^4.22.1",
"express-rate-limit": "^8.2.1",
"helmet": "^8.0.0",
"hsts": "^2.2.0",
"jsonc": "^2.0.0",
Expand Down
3 changes: 2 additions & 1 deletion SignallingWebServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
},
"dependencies": {
"@epicgames-ps/lib-pixelstreamingsignalling-ue5.7": "*",
"body-parser": "^1.20.4",
"commander": "^12.0.0",
"express": "^4.21.2",
"express": "^4.22.1",
"express-openapi": "^12.1.3",
"jsonc": "^2.0.0"
},
Expand Down
Loading