From f986e719daf8d66670643af55e74fa9be6fa6ba2 Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Thu, 14 Oct 2021 23:02:49 +0200 Subject: [PATCH] [mirotalksfu] - refactoring --- app/src/Server.js | 2 ++ package.json | 24 ++++++++++++++---------- public/css/Room.css | 6 +++--- public/sfu/MediasoupClient.js | 10 +++++++++- public/view/Room.html | 33 ++------------------------------- 5 files changed, 30 insertions(+), 45 deletions(-) diff --git a/app/src/Server.js b/app/src/Server.js index 5b13a811..42e28ea1 100644 --- a/app/src/Server.js +++ b/app/src/Server.js @@ -153,6 +153,7 @@ async function ngrokStart() { server: host, tunnel: tunnel, api_docs: api_docs, + mediasoup_version: mediasoup.version, }); } catch (err) { log.error('Ngrok Start error: ', err); @@ -186,6 +187,7 @@ httpsServer.listen(config.listenPort, () => { log.debug('Listening on', { server: host, api_docs: api_docs, + mediasoup_version: mediasoup.version, }); }); diff --git a/package.json b/package.json index b62cbe2d..10b002d2 100644 --- a/package.json +++ b/package.json @@ -9,23 +9,27 @@ "compile": "npx browserify public/sfu/MediasoupClientCompile.js -o public/sfu/MediasoupClient.js", "lint": "npx prettier --write ." }, + "repository": { + "type": "git", + "url": "git+https://github.com/miroslavpejic85/mirotalksfu" + }, "author": "Miroslav Pejic", "license": "AGPLv3", "dependencies": { - "compression": "^1.7.4", - "cors": "^2.8.5", - "express": "^4.17.1", - "httpolyglot": "^0.1.2", + "compression": "1.7.4", + "cors": "2.8.5", + "express": "4.17.1", + "httpolyglot": "0.1.2", "mediasoup": "3.8.4", - "mediasoup-client": "3.6.42", - "ngrok": "^4.2.2", - "socket.io": "^4.2.0", - "swagger-ui-express": "^4.1.6", + "mediasoup-client": "3.6.43", + "ngrok": "4.2.2", + "socket.io": "4.2.0", + "swagger-ui-express": "4.1.6", "uuid": "8.3.2", - "yamljs": "^0.3.0" + "yamljs": "0.3.0" }, "devDependencies": { - "node-fetch": "^3.0.0", + "node-fetch": "3.0.0", "prettier": "2.4.1" } } diff --git a/public/css/Room.css b/public/css/Room.css index 435563b0..3a888255 100644 --- a/public/css/Room.css +++ b/public/css/Room.css @@ -122,7 +122,7 @@ body { } .sidenav button:hover { - color: rgb(0, 180, 50); + color: grey; transform: var(--btns-hover-scale); } @@ -471,7 +471,7 @@ emoji-picker { } #about a:hover { - color: rgb(0, 180, 50); + color: grey; transition: all 0.3s ease-in-out; } @@ -530,7 +530,7 @@ button { } button:hover { - color: rgb(0, 180, 50); + color: grey; transform: var(--btns-hover-scale); } diff --git a/public/sfu/MediasoupClient.js b/public/sfu/MediasoupClient.js index 36477dec..61fff5e5 100644 --- a/public/sfu/MediasoupClient.js +++ b/public/sfu/MediasoupClient.js @@ -6269,6 +6269,7 @@ const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() }; logger.debug('stopSending() | calling pc.setRemoteDescription() [answer:%o]', answer); await this._pc.setRemoteDescription(answer); + this._mapMidTransceiver.delete(localId); } async replaceTrack(localId, track) { this._assertSendDirection(); @@ -6399,6 +6400,7 @@ const answer = await this._pc.createAnswer(); logger.debug('stopReceiving() | calling pc.setLocalDescription() [answer:%o]', answer); await this._pc.setLocalDescription(answer); + this._mapMidTransceiver.delete(localId); } async pauseReceiving( // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -6818,6 +6820,7 @@ const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() }; logger.debug('stopSending() | calling pc.setRemoteDescription() [answer:%o]', answer); await this._pc.setRemoteDescription(answer); + this._mapMidTransceiver.delete(localId); } async replaceTrack(localId, track) { this._assertSendDirection(); @@ -6947,6 +6950,7 @@ const answer = await this._pc.createAnswer(); logger.debug('stopReceiving() | calling pc.setLocalDescription() [answer:%o]', answer); await this._pc.setLocalDescription(answer); + this._mapMidTransceiver.delete(localId); } async pauseReceiving(localId) { this._assertRecvDirection(); @@ -7822,6 +7826,7 @@ const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() }; logger.debug('stopSending() | calling pc.setRemoteDescription() [answer:%o]', answer); await this._pc.setRemoteDescription(answer); + this._mapMidTransceiver.delete(localId); } async replaceTrack(localId, track) { this._assertSendDirection(); @@ -7954,6 +7959,7 @@ const answer = await this._pc.createAnswer(); logger.debug('stopReceiving() | calling pc.setLocalDescription() [answer:%o]', answer); await this._pc.setLocalDescription(answer); + this._mapMidTransceiver.delete(localId); } async pauseReceiving(localId) { this._assertRecvDirection(); @@ -9451,6 +9457,7 @@ const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() }; logger.debug('stopSending() | calling pc.setRemoteDescription() [answer:%o]', answer); await this._pc.setRemoteDescription(answer); + this._mapMidTransceiver.delete(localId); } async replaceTrack(localId, track) { this._assertSendDirection(); @@ -9580,6 +9587,7 @@ const answer = await this._pc.createAnswer(); logger.debug('stopReceiving() | calling pc.setLocalDescription() [answer:%o]', answer); await this._pc.setLocalDescription(answer); + this._mapMidTransceiver.delete(localId); } async pauseReceiving(localId) { this._assertRecvDirection(); @@ -11157,7 +11165,7 @@ /** * Expose mediasoup-client version. */ - exports.version = '3.6.42'; + exports.version = '3.6.43'; /** * Expose parseScalabilityMode() function. */ diff --git a/public/view/Room.html b/public/view/Room.html index 0cacf2f1..8d789c28 100644 --- a/public/view/Room.html +++ b/public/view/Room.html @@ -130,7 +130,7 @@ access to use this app. - + @@ -243,36 +243,7 @@ access to use this app.
-
-
-
-
-
Participant
-
00:00:00
-
-
Public message example
-
-
-
-
-
-
-
You
-
00:00:00
-
-
Public message example
-
-
+