Merge branch 'dev'

.github_build/Build.restreamer-ui.env

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

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Restreamer-UI
 
+### 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
 
 -   Add low_delay option to processing (default: true)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"bundle": "restreamer-v2.3.0",
 	"private": false,
 	"license": "Apache-2.0",
@@ -92,4 +92,4 @@
 		"url-parse@1.5.3": "patch:url-parse@npm:1.5.3#.yarn/patches/url-parse-npm-1.5.3-225ab9cae7.patch",
 		"react-error-overlay": "6.0.9"
 	}
-}
+}

src/version.js

@@ -1,6 +1,6 @@
 import { name, version, bundle } from '../package.json';
 
-const Core = '^16.10.0';
+const Core = '^16.10.1';
 const FFmpeg = '^4.1.0 || ^5.0.0';
 const UI = bundle ? bundle : name + ' v' + version;
 const Version = version;

src/views/Settings.js

@@ -175,6 +175,18 @@ const configValues = {
 			return null;
 		},
 	},
+	'tls.email': {
+		tab: 'network',
+		set: (config, value) => {
+			config.tls.email = value;
+		},
+		unset: (config) => {
+			delete config.tls.email;
+		},
+		validate: (config) => {
+			return null;
+		},
+	},
 	'api.auth.enable': {
 		tab: 'auth',
 		set: (config, value) => {
@@ -1447,6 +1459,22 @@ export default function Settings(props) {
 										<Trans>Let's Encrypt requires one or more public domain names and an accessible port 80/TCP.</Trans>
 									</Typography>
 								</Grid>
+								<Grid item xs={12}>
+									<TextField
+										label={<Trans>Email</Trans>}
+										env={env('tls.email')}
+										disabled={env('tls.email') || !config.tls.auto}
+										value={config.tls.email}
+										onChange={handleChange('tls.email')}
+									/>
+									<ErrorBox configvalue="tls.email" messages={$tabs.network.messages} />
+									<Typography variant="caption">
+										<Trans>
+											Please enter your email address to signify agreement with the Let's Encrypt CA's terms of service and to be notified
+											in case of issues.
+										</Trans>
+									</Typography>
+								</Grid>
 								<Grid item xs={12}>
 									<Divider />
 								</Grid>