From 2a4405fb7fd89b57d76f41fbaf10d007fcfc9bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Mon, 18 May 2020 23:24:07 +0200
Subject: [PATCH 1/5] Add version to about

---
 app/.env                             |  2 ++
 app/src/components/Controls/About.js | 19 ++++++++++++++-----
 app/src/translations/cn.json         |  1 +
 app/src/translations/cs.json         |  1 +
 app/src/translations/de.json         |  1 +
 app/src/translations/dk.json         |  1 +
 app/src/translations/el.json         |  1 +
 app/src/translations/en.json         |  1 +
 app/src/translations/es.json         |  1 +
 app/src/translations/fr.json         |  1 +
 app/src/translations/hr.json         |  1 +
 app/src/translations/hu.json         |  1 +
 app/src/translations/it.json         |  1 +
 app/src/translations/lv.json         |  1 +
 app/src/translations/nb.json         |  1 +
 app/src/translations/pl.json         |  1 +
 app/src/translations/pt.json         |  1 +
 app/src/translations/ro.json         |  1 +
 app/src/translations/tr.json         |  1 +
 app/src/translations/tw.json         |  1 +
 app/src/translations/uk.json         |  1 +
 21 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 app/.env

diff --git a/app/.env b/app/.env
new file mode 100644
index 0000000..86c714e
--- /dev/null
+++ b/app/.env
@@ -0,0 +1,2 @@
+REACT_APP_VERSION=$npm_package_version
+REACT_APP_NAME=$npm_package_name
\ No newline at end of file
diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js
index d361a8c..c7da15f 100644
--- a/app/src/components/Controls/About.js
+++ b/app/src/components/Controls/About.js
@@ -42,8 +42,9 @@ const styles = (theme) =>
 		},
 		link :
 		{
-			display   : 'block',
-			textAlign : 'center'
+			display      : 'block',
+			textAlign    : 'center',
+			marginBottom : '1em'
 		}
 	});
 
@@ -68,15 +69,16 @@ const About = ({
 				/>
 			</DialogTitle>
 			<DialogContent dividers='true'>
-				<DialogContentText>
+				<DialogContentText paragraph> 
 					Contributions to this work were made on behalf of the GÉANT
 					project, a project that has received funding from the
 					European Union’s Horizon 2020 research and innovation 
 					programme under Grant Agreement No. 731122 (GN4-2). 
 					On behalf of GÉANT project, GÉANT Association is the sole
 					owner of the copyright in all material which was developed 
-					by a member of the GÉANT project.<br />
-					<br />
+					by a member of the GÉANT project.
+				</DialogContentText>
+				<DialogContentText paragraph> 
 					GÉANT Vereniging (Association) is registered with the
 					Chamber of Commerce in Amsterdam with registration number
 					40535155 and operates in the UK as a branch of GÉANT
@@ -87,6 +89,13 @@ const About = ({
 				<Link href='https://edumeet.org' target='_blank' rel='noreferrer' color='secondary' variant='h6' className={classes.link}>
 					https://edumeet.org
 				</Link>
+				<DialogContentText align='center' variant='h7'>
+					<FormattedMessage
+						id='label.version'
+						defaultMessage='Version'
+					/>
+					:{` ${process.env.REACT_APP_VERSION}`}
+				</DialogContentText>
 			</DialogContent>
 			<DialogActions>
 				{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json
index c5f79e4..bce7bd6 100644
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "设置",
 	"settings.camera": "视频设备",
diff --git a/app/src/translations/cs.json b/app/src/translations/cs.json
index c1ea569..ec8caf8 100644
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@@ -118,6 +118,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Nastavení",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/de.json b/app/src/translations/de.json
index 9339d4f..1fa0d8c 100644
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Video hinzufügen",
 	"label.promoteAllPeers": "Alle Teilnehmer reinlassen",
 	"label.moreActions": "Weitere Aktionen",
+	"label.version": null,
 
 	"settings.settings": "Einstellungen",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json
index edeb619..190dc52 100644
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Indstillinger",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/el.json b/app/src/translations/el.json
index 6807831..695ca42 100644
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ρυθμίσεις",
 	"settings.camera": "Κάμερα",
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index 30c21d7..653f3b3 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Add video",
 	"label.promoteAllPeers": "Promote all",
 	"label.moreActions": "More actions",
+	"label.version": "Version",
 
 	"settings.settings": "Settings",
 	"settings.camera": "Camera",
diff --git a/app/src/translations/es.json b/app/src/translations/es.json
index 4e0c12a..0156bed 100644
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ajustes",
 	"settings.camera": "Cámara",
diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json
index 0f2ac0b..4c6f9e2 100644
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Paramètres",
 	"settings.camera": "Caméra",
diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json
index 59873d4..3329d51 100644
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj video",
 	"label.promoteAllPeers": "Promoviraj sve",
 	"label.moreActions": "Više akcija",
+	"label.version": null,
 
 	"settings.settings":  "Postavke",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json
index 1a2832b..287fed6 100644
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Videó hozzáadása",
 	"label.promoteAllPeers": "Mindenkit beengedek",
 	"label.moreActions": "További műveletek",
+	"label.version": "Verzió",
 
 	"settings.settings": "Beállítások",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/it.json b/app/src/translations/it.json
index 02b53e7..3aaa21d 100644
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Aggiungi video",
 	"label.promoteAllPeers": "Promuovi tutti",
 	"label.moreActions": "Altre azioni",
+	"label.version": null,
 
 	"settings.settings": "Impostazioni",
 	"settings.camera": "Videocamera",
diff --git a/app/src/translations/lv.json b/app/src/translations/lv.json
index 62ee61e..46f2f9b 100644
--- a/app/src/translations/lv.json
+++ b/app/src/translations/lv.json
@@ -116,6 +116,7 @@
 	"label.advanced": "Advancēts",
 	"label.addVideo": "Pievienot video",
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Iestatījumi",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json
index 5bafeb6..d497bbd 100644
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Legg til video",
 	"label.promoteAllPeers": "Slipp inn alle",
 	"label.moreActions": "Flere handlinger",
+	"label.version": null,
 
 	"settings.settings": "Innstillinger",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json
index 7612f99..33883ee 100644
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj wideo",
 	"label.promoteAllPeers": "Wpuść wszystkich",
 	"label.moreActions": "Więcej akcji",
+	"label.version": null,
 
 	"settings.settings": "Ustawienia",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json
index a2a3310..adfa08e 100644
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Definições",
 	"settings.camera": "Camera",
diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json
index 7161bd4..f1e69b5 100644
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Setări",
 	"settings.camera": "Cameră video",
diff --git a/app/src/translations/tr.json b/app/src/translations/tr.json
index 1876bab..dc40126 100644
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ayarlar",
 	"settings.camera": "Kamera",
diff --git a/app/src/translations/tw.json b/app/src/translations/tw.json
index 99c32d7..83f25ab 100644
--- a/app/src/translations/tw.json
+++ b/app/src/translations/tw.json
@@ -118,6 +118,7 @@
 	"label.addVideo": "新增視訊",
 	"label.promoteAllPeers": "提升全部",
 	"label.moreActions": "更多",
+	"label.version": null,
 
 	"settings.settings": "設置",
 	"settings.camera": "視訊來源",
diff --git a/app/src/translations/uk.json b/app/src/translations/uk.json
index 2ee6774..56d8cec 100644
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Налаштування",
 	"settings.camera": "Камера",

From 2bd7218379448dd93511152a824f2fc03060f3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Tue, 19 May 2020 07:50:01 +0200
Subject: [PATCH 2/5] replace em with theme.spacing

---
 app/src/components/Controls/About.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js
index c7da15f..c462549 100644
--- a/app/src/components/Controls/About.js
+++ b/app/src/components/Controls/About.js
@@ -44,7 +44,7 @@ const styles = (theme) =>
 		{
 			display      : 'block',
 			textAlign    : 'center',
-			marginBottom : '1em'
+			marginBottom : theme.spacing(1)
 		}
 	});
 

From 28995ad74f53e92ac432989aa17c9ff60210de74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Tue, 19 May 2020 13:25:52 +0200
Subject: [PATCH 3/5] Only on mobile add lobbypeers action

---
 app/src/components/Controls/TopBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index 148f4a7..e46ba12 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -480,7 +480,7 @@ const TopBar = (props) =>
 							<MoreIcon />
 						</IconButton>
 					</div>
-					{ lobbyPeers.length > 0 &&
+					{ isMobile && lobbyPeers.length > 0 &&
 					<Tooltip 
 						title={intl.formatMessage({
 							id             : 'tooltip.lobby',

From b0e57756cb68598dc3ac305e968defc30d7034c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Tue, 19 May 2020 13:35:33 +0200
Subject: [PATCH 4/5] Fix previous commit, move it to sectionMobile

---
 app/src/components/Controls/TopBar.js | 57 ++++++++++++++-------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index e46ba12..d6ee365 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -479,35 +479,36 @@ const TopBar = (props) =>
 						>
 							<MoreIcon />
 						</IconButton>
-					</div>
-					{ isMobile && lobbyPeers.length > 0 &&
-					<Tooltip 
-						title={intl.formatMessage({
-							id             : 'tooltip.lobby',
-							defaultMessage : 'Show lobby'
-						})}
-					>
-						<span className={classes.disabledButton}>
-							<IconButton
-								aria-label={intl.formatMessage({
-									id             : 'tooltip.lobby',
-									defaultMessage : 'Show lobby'
-								})}
-								className={classes.actionButton}
-								color='inherit'
-								disabled={!canPromote}
-								onClick={() => setLockDialogOpen(!room.lockDialogOpen)}
-							>
-								<PulsingBadge
-									color='secondary'
-									badgeContent={lobbyPeers.length}
+						{ lobbyPeers.length > 0 &&
+						<Tooltip 
+							title={intl.formatMessage({
+								id             : 'tooltip.lobby',
+								defaultMessage : 'Show lobby'
+							})}
+						>
+							<span className={classes.disabledButton}>
+								<IconButton
+									aria-label={intl.formatMessage({
+										id             : 'tooltip.lobby',
+										defaultMessage : 'Show lobby'
+									})}
+									className={classes.actionButton}
+									color='inherit'
+									disabled={!canPromote}
+									onClick={() => setLockDialogOpen(!room.lockDialogOpen)}
 								>
-									<SecurityIcon />
-								</PulsingBadge>
-							</IconButton>
-						</span>
-					</Tooltip>
-					}					
+									<PulsingBadge
+										color='secondary'
+										badgeContent={lobbyPeers.length}
+									>
+										<SecurityIcon />
+									</PulsingBadge>
+								</IconButton>
+							</span>
+						</Tooltip>
+						}					
+
+					</div>
 					<div className={classes.divider} />
 					<Button
 						aria-label={intl.formatMessage({

From 0f184a3a296fdac0bbdc0b9a2946f0fbc7f30499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Tue, 19 May 2020 14:09:27 +0200
Subject: [PATCH 5/5] Socket request timeout handling, with retries.

---
 app/public/config/config.example.js |  3 ++-
 app/src/RoomClient.js               | 38 +++++++++++++++++++++++------
 app/src/utils.js                    | 20 ++++++++++++++-
 server/config/config.example.js     |  4 +++
 server/lib/Room.js                  | 34 +++++++++++++++++++++++---
 server/lib/errors.js                | 22 +++++++++++++++++
 6 files changed, 109 insertions(+), 12 deletions(-)
 create mode 100644 server/lib/errors.js

diff --git a/app/public/config/config.example.js b/app/public/config/config.example.js
index e07d994..bbd9a03 100644
--- a/app/public/config/config.example.js
+++ b/app/public/config/config.example.js
@@ -37,7 +37,8 @@ var config =
 		'opera'
 	],
 	// Socket.io request timeout
-	requestTimeout   : 10000,
+	requestTimeout   : 20000,
+	requestRetries   : 3,
 	transportOptions :
 	{
 		tcp : true
diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 1bf75c6..16f5b6b 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1,6 +1,7 @@
 import Logger from './Logger';
 import hark from 'hark';
 import { getSignalingUrl } from './urlFactory';
+import { SocketTimeoutError } from './utils';
 import * as requestActions from './actions/requestActions';
 import * as meActions from './actions/meActions';
 import * as roomActions from './actions/roomActions';
@@ -574,7 +575,7 @@ export default class RoomClient
 				if (called)
 					return;
 				called = true;
-				callback(new Error('Request timeout.'));
+				callback(new SocketTimeoutError('Request timed out'));
 			},
 			ROOM_OPTIONS.requestTimeout
 		);
@@ -590,13 +591,13 @@ export default class RoomClient
 		};
 	}
 
-	sendRequest(method, data)
+	_sendRequest(method, data)
 	{
 		return new Promise((resolve, reject) =>
 		{
 			if (!this._signalingSocket)
 			{
-				reject('No socket connection.');
+				reject('No socket connection');
 			}
 			else
 			{
@@ -606,19 +607,42 @@ export default class RoomClient
 					this.timeoutCallback((err, response) =>
 					{
 						if (err)
-						{
 							reject(err);
-						}
 						else
-						{
 							resolve(response);
-						}
 					})
 				);
 			}
 		});
 	}
 
+	async sendRequest(method, data)
+	{
+		logger.debug('sendRequest() [method:"%s", data:"%o"]', method, data);
+
+		const {
+			requestRetries = 3
+		} = window.config;
+
+		for (let tries = 0; tries < requestRetries; tries++)
+		{
+			try
+			{
+				return await this._sendRequest(method, data);
+			}
+			catch (error)
+			{
+				if (
+					error instanceof SocketTimeoutError &&
+					tries < requestRetries
+				)
+					logger.warn('sendRequest() | timeout, retrying [attempt:"%s"]', tries);
+				else
+					throw error;
+			}
+		}
+	}
+
 	async changeDisplayName(displayName)
 	{
 		logger.debug('changeDisplayName() [displayName:"%s"]', displayName);
diff --git a/app/src/utils.js b/app/src/utils.js
index 1fba8b3..76e88db 100644
--- a/app/src/utils.js
+++ b/app/src/utils.js
@@ -16,4 +16,22 @@ export const idle = (callback, delay) =>
 
 		handle = setTimeout(callback, delay);
 	};
-};
\ No newline at end of file
+};
+
+/**
+ * Error produced when a socket request has a timeout.
+ */
+export class SocketTimeoutError extends Error
+{
+	constructor(message)
+	{
+		super(message);
+
+		this.name = 'SocketTimeoutError';
+
+		if (Error.hasOwnProperty('captureStackTrace')) // Just in V8.
+			Error.captureStackTrace(this, SocketTimeoutError);
+		else
+			this.stack = (new Error(message)).stack;
+	}
+}
\ No newline at end of file
diff --git a/server/config/config.example.js b/server/config/config.example.js
index e08f910..6ca4a27 100644
--- a/server/config/config.example.js
+++ b/server/config/config.example.js
@@ -276,6 +276,10 @@ module.exports =
 	// maxUsersPerRoom    : 20,
 	// Room size before spreading to new router
 	routerScaleSize      : 40,
+	// Socket timout value
+	requestTimeout       : 20000,
+	// Socket retries when timeout
+	requestRetries       : 3,
 	// Mediasoup settings
 	mediasoup            :
 	{
diff --git a/server/lib/Room.js b/server/lib/Room.js
index f110327..0e58c23 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -3,6 +3,7 @@ const AwaitQueue = require('awaitqueue');
 const axios = require('axios');
 const Logger = require('./Logger');
 const Lobby = require('./Lobby');
+const { SocketTimeoutError } = require('./errors');
 const { v4: uuidv4 } = require('uuid');
 const jwt = require('jsonwebtoken');
 const userRoles = require('../userRoles');
@@ -1759,9 +1760,9 @@ class Room extends EventEmitter
 				if (called)
 					return;
 				called = true;
-				callback(new Error('Request timeout.'));
+				callback(new SocketTimeoutError('Request timed out'));
 			},
-			10000
+			config.requestTimeout || 20000
 		);
 
 		return (...args) =>
@@ -1775,7 +1776,7 @@ class Room extends EventEmitter
 		};
 	}
 
-	_request(socket, method, data = {})
+	_sendRequest(socket, method, data = {})
 	{
 		return new Promise((resolve, reject) =>
 		{
@@ -1797,6 +1798,33 @@ class Room extends EventEmitter
 		});
 	}
 
+	async _request(socket, method, data)
+	{
+		logger.debug('_request() [method:"%s", data:"%o"]', method, data);
+
+		const {
+			requestRetries = 3
+		} = config;
+
+		for (let tries = 0; tries < requestRetries; tries++)
+		{
+			try
+			{
+				return await this._sendRequest(socket, method, data);
+			}
+			catch (error)
+			{
+				if (
+					error instanceof SocketTimeoutError &&
+					tries < requestRetries
+				)
+					logger.warn('_request() | timeout, retrying [attempt:"%s"]', tries);
+				else
+					throw error;
+			}
+		}
+	}
+
 	_notification(socket, method, data = {}, broadcast = false, includeSender = false)
 	{
 		if (broadcast)
diff --git a/server/lib/errors.js b/server/lib/errors.js
new file mode 100644
index 0000000..379838d
--- /dev/null
+++ b/server/lib/errors.js
@@ -0,0 +1,22 @@
+/**
+ * Error produced when a socket request has a timeout.
+ */
+class SocketTimeoutError extends Error
+{
+	constructor(message)
+	{
+		super(message);
+
+		this.name = 'SocketTimeoutError';
+
+		if (Error.hasOwnProperty('captureStackTrace')) // Just in V8.
+			Error.captureStackTrace(this, SocketTimeoutError);
+		else
+			this.stack = (new Error(message)).stack;
+	}
+}
+
+module.exports =
+{
+	SocketTimeoutError
+};
\ No newline at end of file