Merge branch 'dev'

.github_build/Build.restreamer-ui.env

@@ -1,3 +1,3 @@
 # RESTREAMER UI
-RELEASE=1.4.0
-NODE_IMAGE=node:18.9.0-alpine3.15
+RELEASE=1.5.0
+NODE_IMAGE=node:19.0-alpine3.16

CHANGELOG.md

@@ -1,18 +1,45 @@
 # Restreamer-UI
 
-### v1.3.0 > v1.4.0
+## v1.4.0 > v1.5.0
+
+-   Add changelog viewer
+-   Add skills props to encoder and decoder components
+-   Add fps_mode to x264, x265, vp9 encoder
+-   Add scale filter to non-hwaccel encoders
+-   Add PeerTube and Media Network to publication services (plattforms, software)
+-   Add reset button to hide a player logo ([#431](https://github.com/datarhei/restreamer/issues/431))
+-   Mod expands V4L2_M2M options (an unstable RPI 64bit encoder)
+-   Mod indicates a faulty cache configuration
+-   Mod switches to the improved SRT syntax (thx to SA Consulting)
+-   Mod improves display of progress data
+-   Mod removes deprecated param ocl - now ochl (ff5)
+-   Mod simplifies the setup of Restreamer-to-Restreamer connections
+-   Mod adds Istafeed.me as StreamKey service to Instagram's publishing service
+-   Mod renames "Low delay" to "Low latency (buffer)" and set false as default (requires more feedback)
+-   Del removes support for clappr player
+-   Fix npm dependencies (security fixes)
+-   Fix videojs-overlay logo size ([#431](https://github.com/datarhei/restreamer/issues/431))
+-   Fix use of TLS for input from local RTMP server
+-   Fix Icecast publication service settings (datarhei/restreamer#429)
+-   Fix removes SRT bitstream on tee (OBS > RTMP > SRT is faulty)
+
+Dependency:
+
+-   datarhei Core v16.11.0+
+
+## v1.3.0 > v1.4.0
 
 -   Add email field for Let's Encrypt certification
 
 Dependency:
 
 -   datarhei Core v16.10.1+
 
-### v1.2.0 > v1.3.0
+## v1.2.0 > v1.3.0
 
+-   Add dlive & Trovo publication services
 -   Add low_delay option to processing (default: true)
 -   Mod uses the ingest stream for publication (datarhei/restreamer#411)
--   Add dlive & Trovo publication services
 -   Mod optimized DVR on DiskFS
 -   Mod updates packages
 -   Fix SRT bitstream on tee
@@ -25,7 +52,7 @@ Dependency:
 
 -   datarhei Core v16.10.0+
 
-#### v1.1.0 > v1.2.0
+## v1.1.0 > v1.2.0
 
 -   Add allow writing HLS to disk
 -   Add audio pan filter
@@ -56,7 +83,7 @@ Dependency:
 
 -   datarhei Core v16.9.0+
 
-#### v1.0.0 > v1.1.0
+## v1.0.0 > v1.1.0
 
 -   Add compatibility list for encoders
 -   Add "HLS cleanup" as an optional function ([Philipp Trenz](https://github.com/philipptrenz))

Caddyfile

@@ -1,4 +1,4 @@
-http://127.0.0.1:3000
+:3000
 
 encode zstd gzip
 file_server {

Dockerfile

@@ -1,5 +1,5 @@
-ARG NODE_IMAGE=node:18.6.0-alpine3.15
-ARG CADDY_IMAGE=caddy:2.5.2-alpine
+ARG NODE_IMAGE=node:19.0-alpine3.16
+ARG CADDY_IMAGE=caddy:2.6.2-alpine
 
 FROM $NODE_IMAGE as builder
 
@@ -13,13 +13,10 @@ COPY . /ui
 WORKDIR /ui
 
 RUN cd /ui && \
-	npm config set fetch-retries 10 && \
-	npm config set fetch-retry-mintimeout 100000 && \
-	npm config set fetch-retry-maxtimeout 600000 && \
-	npm config set cache-min 3600 && \
-	npm config ls -l && \
-	npm install && \
-	npm run build
+	yarn set version berry && \
+	yarn config set httpTimeout 600000 && \
+ 	yarn install && \
+ 	yarn run build
 
 FROM $CADDY_IMAGE
 
@@ -30,4 +27,4 @@ WORKDIR /ui
 
 EXPOSE 3000
 
-CMD [ "caddy", "run", "-config", "/ui/Caddyfile" ]
+CMD [ "caddy", "run", "--config", "/ui/Caddyfile" ]

README.md

@@ -26,23 +26,5 @@ $ npm run i18n-extract:clean
 $ npm run i18n-compile
 ```
 
-### Known outdated dependencies
-Requires MUI 5.2+ & React 18 compatibility. Clappr-Player upgrade (or removal).
-
-```sh
-@mui/material                             5.1.1  →            5.9.0     
-@mui/styles                              ^5.1.1  →           ^5.9.0     
-@testing-library/dom                    ^8.13.0  →          ^8.16.0     
-@testing-library/jest-dom                ^4.2.4  →          ^5.16.4     
-@testing-library/react                  ^12.1.5  →          ^13.3.0     
-@testing-library/user-event             ^13.5.0  →          ^14.2.5     
-eslint                                  ^7.32.0  →          ^8.19.0     
-hls.js                                 ^0.14.17  →           ^1.1.5     
-react                                   ^17.0.2  →          ^18.2.0     
-react-dom                               ^17.0.2  →          ^18.2.0     
-react-scripts                            ^4.0.3  →           ^5.0.1     
-typescript                               ^3.9.7  →           ^4.7.4 
-```
-
 ## License
 See the [LICENSE](./LICENSE) file for licensing information.

package.json

@@ -1,51 +1,50 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.4.0",
-	"bundle": "restreamer-v2.3.0",
+	"version": "1.5.0",
+	"bundle": "restreamer-v2.4.0",
 	"private": false,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@auth0/auth0-spa-js": "^1.22.3",
-		"@clappr/core": "^0.4.21",
-		"@clappr/hlsjs-playback": "^0.6.0",
-		"@clappr/plugins": "^0.4.16",
-		"@clappr/stats-plugin": "^0.2.0",
-		"@emotion/react": "^11.10.0",
-		"@emotion/styled": "^11.10.0",
-		"@fontsource/dosis": "^4.5.9",
+		"@auth0/auth0-spa-js": "^2.0.0",
+		"@babel/plugin-syntax-flow": "^7.18.6",
+		"@babel/plugin-transform-react-jsx": "^7.19.0",
+		"@emotion/react": "^11.10.5",
+		"@emotion/styled": "^11.10.5",
+		"@fontsource/dosis": "^4.5.10",
 		"@fontsource/roboto": "^4.5.8",
-		"@fortawesome/fontawesome-svg-core": "^6.1.2",
-		"@fortawesome/free-brands-svg-icons": "^6.1.2",
-		"@fortawesome/free-solid-svg-icons": "^6.1.2",
+		"@fortawesome/fontawesome-svg-core": "^6.2.0",
+		"@fortawesome/free-brands-svg-icons": "^6.2.0",
+		"@fortawesome/free-solid-svg-icons": "^6.2.0",
 		"@fortawesome/react-fontawesome": "^0.2.0",
-		"@lingui/core": "^3.14.0",
-		"@lingui/macro": "^3.14.0",
-		"@lingui/react": "^3.14.0",
-		"@mui/icons-material": "^5.10.2",
-		"@mui/lab": "^5.0.0-alpha.96",
-		"@mui/material": "5.1.1",
-		"@mui/styles": "^5.1.1",
-		"@testing-library/dom": "^8.13.0",
-		"@testing-library/jest-dom": "^4.2.4",
-		"@testing-library/react": "^12.1.5",
-		"@testing-library/user-event": "^13.5.0",
+		"@lingui/core": "^3.15.0",
+		"@lingui/macro": "^3.15.0",
+		"@lingui/react": "^3.15.0",
+		"@mui/icons-material": "^5.10.9",
+		"@mui/lab": "^5.0.0-alpha.107",
+		"@mui/material": "^5.10.13",
+		"@mui/styles": "^5.10.10",
+		"@testing-library/dom": "^8.19.0",
+		"@testing-library/jest-dom": "^5.16.5",
+		"@testing-library/react": "^13.4.0",
+		"@testing-library/user-event": "^14.4.3",
+		"@types/react": "^18.0.25",
 		"babel-plugin-macros": "^3.1.0",
-		"eslint": "^7.32.0",
+		"eslint": "^8.27.0",
 		"handlebars": "^4.7.7",
-		"hls.js": "^0.14.17",
 		"jwt-decode": "^3.1.2",
 		"make-plural": "^7.1.0",
-		"react": "^17.0.2",
+		"react": "^18.2.0",
 		"react-colorful": "^5.6.1",
 		"react-device-detect": "^2.2.2",
-		"react-dom": "^17.0.2",
-		"react-router-dom": "^6.3.0",
-		"react-scripts": "^4.0.3",
-		"semver": "^7.3.7",
-		"typescript": "^3.9.7",
+		"react-dom": "^18.2.0",
+		"react-markdown": "^8.0.3",
+		"react-router-dom": "^6.4.3",
+		"react-scripts": "5.0.1",
+		"semver": "^7.3.8",
+		"typescript": "^4.8.4",
 		"url-parse": "^1.5.10",
-		"uuid": "^8.3.2",
-		"video.js": "^7.20.2",
+		"uuid": "^9.0.0",
+		"video.js": "^7.20.3",
 		"videojs-overlay": "^2.1.5"
 	},
 	"scripts": {
@@ -73,7 +72,7 @@
 	},
 	"browserslist": {
 		"production": [
-			"> 0.5%, last 2 versions, Firefox ESR, not dead, not IE 11, maintained node versions"
+			"> 0.5%, last 2 versions, Firefox ESR, not dead, not IE 11"
 		],
 		"development": [
 			"last 1 chrome version",
@@ -82,14 +81,12 @@
 		]
 	},
 	"devDependencies": {
-		"@babel/core": "^7.18.13",
-		"@lingui/cli": "^3.14.0",
+		"@babel/core": "^7.20.2",
+		"@lingui/cli": "^3.15.0",
 		"babel-core": "^7.0.0-bridge.0",
+		"eslint-config-react-app": "^7.0.1",
 		"prettier": "^2.7.1",
 		"react-error-overlay": "^6.0.11"
 	},
-	"resolutions": {
-		"[email protected]": "patch:url-parse@npm:1.5.3#.yarn/patches/url-parse-npm-1.5.3-225ab9cae7.patch",
-		"react-error-overlay": "6.0.9"
-	}
-}
+	"resolutions": {}
+}

public/_player/videojs/dist/video-js-skin.css

@@ -123,13 +123,9 @@
 
 /* overlay */
 
-.vjs-public .vjs-overlay > a > img {
-	width: 100%;
-}
-
-.vjs-public .vjs-overlay-no-background {
-	max-width: 28%!important;
-	max-height: 28%!important;
+.vjs-public .vjs-overlay-no-background > img, .vjs-public .vjs-overlay-no-background > a > img {
+	max-width: 100%!important;
+	max-height: calc(18vw);
 }
 
 .vjs-public .vjs-overlay-top-left {