Skip to content

Commit 91a087e

Browse files
mcottontensormcottontensor
authored
Merge pull request #433 from mcottontensor/backport/UE5.5/pr-420
[UE5.5] Merge pull request #420 from mcottontensor/build-cleanup
2 parents 653255d + 7e3d511 commit 91a087e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+18367
-19494
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
Signalling/node_modules
102102
SignallingWebServer/build
103103
SignallingWebServer/node_modules
104-
SS_Test
104+
Extras/SS_Test
105105
106106
- name: Archive Release .zip
107107
uses: thedoctor0/zip-release@0.7.1
@@ -135,7 +135,6 @@ jobs:
135135
/*/Signalling/node_modules/*
136136
/*/SignallingWebServer/build/*
137137
/*/SignallingWebServer/node_modules/*
138-
/*/SS_Test/*
139138
140139
- name: "Make the release"
141140
uses: ncipollo/release-action@v1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
- "Common/**"
88
- "Signalling/**"
99
- "SignallingWebServer/**"
10-
- "SS_Test/**"
10+
- "Extras/SS_Test/**"
1111
pull_request:
1212
paths:
1313
- "Common/**"
1414
- "Signalling/**"
1515
- "SignallingWebServer/**"
16-
- "SS_Test/**"
16+
- "Extras/SS_Test/**"
1717

1818
jobs:
1919
signalling-protocol-test:
@@ -26,6 +26,6 @@ jobs:
2626
- name: Launch signalling tests in docker containers
2727
uses: isbang/compose-action@v1.5.1
2828
with:
29-
compose-file: "SS_Test/docker-compose.yml"
29+
compose-file: "Extras/SS_Test/docker-compose.yml"
3030
up-flags: "--build --abort-on-container-exit --exit-code-from tester"
3131

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ SignallingWebServer/Public/
88
SignallingWebServer/certificates
99
.vscode
1010
coverage/
11-
common/types/*
11+
common/types/*
12+
.nx/cache
13+
.nx/workspace-data

‎Common/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
dist/
12
build/
23
node_modules/
34
types/

‎Common/package.json‎

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
1-
{
2-
"name": "@epicgames-ps/lib-pixelstreamingcommon-ue5.5",
3-
"version": "0.1.6",
4-
"description": "Common utilities library for Unreal Engine 5.5 Pixel Streaming",
5-
"main": "build/commonjs/pixelstreamingcommon.js",
6-
"module": "build/esm/pixelstreamingcommon.js",
7-
"types": "build/types/pixelstreamingcommon.d.ts",
8-
"sideEffects": false,
9-
"scripts": {
10-
"compile": "tsc --project tsconfig.esm.json && tsc --project tsconfig.cjs.json",
11-
"build": "rimraf ./build && npm run build-proto && npm run compile",
12-
"build-dev": "npm run build-proto && npm run compile",
13-
"build-proto": "protoc --experimental_allow_proto3_optional --ts_out src/Messages --proto_path protobuf protobuf/signalling_messages.proto",
14-
"build-proto-docs": "protoc --doc_out=docs --doc_opt=markdown,messages.md --proto_path protobuf protobuf/signalling_messages.proto",
15-
"build-docs": "typedoc --tsconfig tsconfig.base.json",
16-
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
17-
"test": "echo \"Error: no test specified\" && exit 1"
18-
},
19-
"devDependencies": {
20-
"@types/jest": "^29.5.14",
21-
"@types/webxr": "^0.5.1",
22-
"@typescript-eslint/eslint-plugin": "^6.21.0",
23-
"cspell": "^4.1.0",
24-
"eslint": "^8.11.0",
25-
"eslint-config-prettier": "^9.1.0",
26-
"eslint-plugin-prettier": "^5.2.1",
27-
"eslint-plugin-tsdoc": "^0.2.17",
28-
"jest": "^29.7.0",
29-
"jest-environment-jsdom": "^29.7.0",
30-
"prettier": "3.3.3",
31-
"rimraf": "^5.0.5",
32-
"ts-jest": "^29.2.5",
33-
"ts-loader": "^9.4.2",
34-
"ts-node": "^10.9.2",
35-
"typedoc": "^0.27.4",
36-
"typedoc-plugin-markdown": "^4.3.2",
37-
"typescript": "^5.0.0"
38-
},
39-
"author": "Epic Games",
40-
"license": "MIT",
41-
"publishConfig": {
42-
"access": "public"
43-
},
44-
"dependencies": {
45-
"@protobuf-ts/plugin": "^2.9.3",
46-
"@types/ws": "^8.5.10",
47-
"ws": "^8.17.1"
48-
}
49-
}
1+
{
2+
"name": "@epicgames-ps/lib-pixelstreamingcommon-ue5.5",
3+
"version": "0.1.6",
4+
"description": "Common utilities library for Unreal Engine 5.5 Pixel Streaming",
5+
"main": "dist/cjs/pixelstreamingcommon.js",
6+
"module": "dist/esm/pixelstreamingcommon.js",
7+
"types": "dist/types/pixelstreamingcommon.d.ts",
8+
"sideEffects": false,
9+
"scripts": {
10+
"clean": "rimraf ./dist",
11+
"build:docs:proto": "protoc --doc_out=docs --doc_opt=markdown,messages.md --proto_path protobuf protobuf/signalling_messages.proto",
12+
"build:docs:ts": "typedoc --tsconfig tsconfig.base.json",
13+
"build:docs": "npm run build:docs:proto && npm run build:dos:ts",
14+
"build:proto": "protoc --experimental_allow_proto3_optional --ts_out src/Messages --proto_path protobuf protobuf/signalling_messages.proto",
15+
"build:cjs": "tsc --project tsconfig.cjs.json",
16+
"build:esm": "tsc --project tsconfig.esm.json",
17+
"build": "npm run build:proto && npm run build:cjs && npm run build:esm",
18+
"rebuild": "npm run clean && npm run build",
19+
"watch:proto": "nodemon -V -d 3 --watch protobuf/signalling_messages.proto --exec 'npm run build:proto'",
20+
"watch": "concurrently -k \"npm run watch:proto\" \"tsc --watch --preserveWatchOutput --project tsconfig.esm.json\"",
21+
"lint": "eslint src --ext .js,.jsx,.ts,.tsx",
22+
"test": "echo \"Error: no test specified\" && exit 1"
23+
},
24+
"devDependencies": {
25+
"@types/jest": "^29.5.14",
26+
"@types/webxr": "^0.5.1",
27+
"@typescript-eslint/eslint-plugin": "^6.21.0",
28+
"concurrently": "^9.1.2",
29+
"cspell": "^4.1.0",
30+
"eslint": "^8.11.0",
31+
"eslint-config-prettier": "^9.1.0",
32+
"eslint-plugin-prettier": "^5.2.1",
33+
"eslint-plugin-tsdoc": "^0.2.17",
34+
"jest": "^29.7.0",
35+
"jest-environment-jsdom": "^29.7.0",
36+
"nodemon": "^3.1.9",
37+
"prettier": "3.3.3",
38+
"rimraf": "^5.0.5",
39+
"ts-jest": "^29.2.5",
40+
"ts-loader": "^9.4.2",
41+
"ts-node": "^10.9.2",
42+
"typedoc": "^0.27.4",
43+
"typedoc-plugin-markdown": "^4.3.2",
44+
"typescript": "^5.0.0"
45+
},
46+
"author": "Epic Games",
47+
"license": "MIT",
48+
"publishConfig": {
49+
"access": "public"
50+
},
51+
"dependencies": {
52+
"@protobuf-ts/plugin": "^2.9.3",
53+
"@types/ws": "^8.5.10",
54+
"ws": "^8.17.1"
55+
}
56+
}

‎Common/src/Protocol/KeepaliveMonitor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export class KeepaliveMonitor {
3232
/**
3333
* Creates a new monitor and starts the ping timer. If a pong does not come back by the time we want
3434
* to send a second ping then the connection is considered dead and the onTimeout callback is fired.
35-
* @param protocol The connection that we want to monitor.
36-
* @param timeout The time in milliseconds between ping messages.
35+
* @param protocol - The connection that we want to monitor.
36+
* @param timeout - The time in milliseconds between ping messages.
3737
*/
3838
constructor(protocol: SignallingProtocol, timeout: number) {
3939
this.protocol = protocol;

‎Common/tsconfig.cjs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"extends": "./tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./build/commonjs",
4+
"outDir": "./dist/cjs",
55
"module": "commonjs",
66
"declaration": true,
7-
"declarationDir": "./build/types"
7+
"declarationDir": "./dist/types"
88
}
99
}

‎Common/tsconfig.esm.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"extends": "./tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./build/esm",
5-
"module": "ES6",
4+
"outDir": "./dist/esm",
5+
"module": "es6",
66
"moduleResolution": "bundler"
77
}
88
}

‎Extras/FrontendTests/package.json‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
2-
"name": "frontend-tests",
3-
"version": "1.0.0",
4-
"description": "",
5-
"main": "index.js",
6-
"scripts": {
7-
"test": "playwright test",
8-
"build": ""
9-
},
10-
"keywords": [],
11-
"author": "Epic Games",
12-
"license": "MIT",
13-
"devDependencies": {
14-
"@playwright/test": "^1.49.0",
15-
"@types/node": "^20.12.7",
16-
"@types/uuid": "^9.0.8"
17-
},
18-
"dependencies": {
19-
"@epicgames-ps/lib-pixelstreamingfrontend-ue5.5": "*",
20-
"@epicgames-ps/js-streamer": "^0.0.4",
21-
"dotenv": "^16.4.5",
22-
"node-fetch": "^2.7.0",
23-
"uuid": "^9.0.0"
24-
}
2+
"name": "frontend-tests",
3+
"version": "1.0.0",
4+
"description": "",
5+
"main": "index.js",
6+
"scripts": {
7+
"test": "playwright test",
8+
"build": "",
9+
"clean": ""
10+
},
11+
"keywords": [],
12+
"author": "Epic Games",
13+
"license": "MIT",
14+
"devDependencies": {
15+
"@playwright/test": "^1.49.0",
16+
"@types/node": "^20.12.7",
17+
"@types/uuid": "^9.0.8"
18+
},
19+
"dependencies": {
20+
"@epicgames-ps/lib-pixelstreamingfrontend-ue5.5": "*",
21+
"@epicgames-ps/js-streamer": "^0.0.4",
22+
"dotenv": "^16.4.5",
23+
"node-fetch": "^2.7.0",
24+
"uuid": "^9.0.0"
25+
}
2526
}

‎Extras/JSStreamer/package.json‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
{
2-
"name": "@epicgames-ps/js-streamer",
3-
"version": "0.0.4",
4-
"description": "A Node JS implementation of a webrtc streamer for testing.",
5-
"main": "build/commonjs/pixelstreamingjsstreamer.js",
6-
"types": "build/types/pixelstreamingjsstreamer.d.ts",
7-
"module": "build/esm/pixelstreamingjsstreamer.js",
8-
"scripts": {
9-
"develop": "webpack-dev-server --mode development",
10-
"build": "tsc --project tsconfig.esm.json && tsc --project tsconfig.cjs.json && webpack --mode development",
11-
"build-dev": "tsc --project tsconfig.json && webpack --mode development",
12-
"lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
13-
"test": "echo \"Error: no test specified\" && exit 1"
14-
},
15-
"author": "Epic Games",
16-
"license": "MIT",
17-
"devDependencies": {
18-
"@types/express": "^4.17.21",
19-
"@types/node": "^20.11.13",
20-
"@typescript-eslint/eslint-plugin": "^6.21.0",
21-
"copy-webpack-plugin": "^12.0.2",
22-
"css-loader": "^7.1.2",
23-
"eslint": "^8.11.0",
24-
"eslint-config-prettier": "^9.1.0",
25-
"eslint-plugin-prettier": "^5.2.1",
26-
"eslint-plugin-tsdoc": "^0.2.17",
27-
"html-webpack-plugin": "^5.6.0",
28-
"mini-css-extract-plugin": "^2.9.0",
29-
"nodemon": "^3.1.4",
30-
"prettier": "3.3.3",
31-
"ts-loader": "^9.4.2",
32-
"typescript": "^5.0.0",
33-
"webpack-cli": "^5.1.4",
34-
"webpack-dev-server": "^5.0.4",
35-
"webpack-node-externals": "^3.0.0"
36-
},
37-
"dependencies": {
38-
"express": "^4.21.2",
39-
"@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "*"
40-
},
41-
"repository": {
42-
"type": "git",
43-
"url": "https://github.com/EpicGames/PixelStreamingInfrastructure.git"
44-
}
2+
"name": "@epicgames-ps/js-streamer",
3+
"version": "0.0.4",
4+
"description": "A Node JS implementation of a webrtc streamer for testing.",
5+
"main": "dist/cjs/pixelstreamingjsstreamer.js",
6+
"types": "dist/types/pixelstreamingjsstreamer.d.ts",
7+
"module": "dist/esm/pixelstreamingjsstreamer.js",
8+
"scripts": {
9+
"clean": "rimraf ./dist",
10+
"develop": "webpack-dev-server --mode development",
11+
"build:cjs": "tsc --project tsconfig.cjs.json",
12+
"build:esm": "tsc --project tsconfig.esm.json",
13+
"build": "npm run build:cjs && npm run build:esm && webpack --mode development",
14+
"rebuild": "npm run clean && npm run build",
15+
"lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
16+
"test": "echo \"Error: no test specified\" && exit 1"
17+
},
18+
"author": "Epic Games",
19+
"license": "MIT",
20+
"devDependencies": {
21+
"@types/express": "^4.17.21",
22+
"@types/node": "^20.11.13",
23+
"@typescript-eslint/eslint-plugin": "^6.21.0",
24+
"copy-webpack-plugin": "^12.0.2",
25+
"css-loader": "^7.1.2",
26+
"eslint": "^8.11.0",
27+
"eslint-config-prettier": "^9.1.0",
28+
"eslint-plugin-prettier": "^5.2.1",
29+
"eslint-plugin-tsdoc": "^0.2.17",
30+
"html-webpack-plugin": "^5.6.0",
31+
"mini-css-extract-plugin": "^2.9.0",
32+
"nodemon": "^3.1.4",
33+
"prettier": "3.3.3",
34+
"ts-loader": "^9.4.2",
35+
"typescript": "^5.0.0",
36+
"webpack-cli": "^5.1.4",
37+
"webpack-dev-server": "^5.2.0",
38+
"webpack-node-externals": "^3.0.0"
39+
},
40+
"dependencies": {
41+
"@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "*",
42+
"express": "^4.21.2"
43+
},
44+
"repository": {
45+
"type": "git",
46+
"url": "https://github.com/EpicGames/PixelStreamingInfrastructure.git"
47+
}
4548
}

0 commit comments

Comments
 (0)