From 69925f9479de1bbfc58f9c3ac29ce221779b455e Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Mon, 9 Dec 2024 11:21:49 +0100 Subject: [PATCH] [mirotalksfu] - #185 Fix host url and typo, update dep (thank you nazar-pc) --- app/src/Server.js | 12 ++++++------ app/src/config.template.js | 1 + package.json | 6 +++--- public/js/Room.js | 2 +- public/js/RoomClient.js | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/Server.js b/app/src/Server.js index 45af9e24..1988518b 100644 --- a/app/src/Server.js +++ b/app/src/Server.js @@ -55,7 +55,7 @@ dev dependencies: { * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.45 + * @version 1.6.46 * */ @@ -64,7 +64,7 @@ const { auth, requiresAuth } = require('express-openid-connect'); const cors = require('cors'); const compression = require('compression'); const socketIo = require('socket.io'); -const https = require('httpolyglot'); +const httpolyglot = require('httpolyglot'); const mediasoup = require('mediasoup'); const mediasoupClient = require('mediasoup-client'); const http = require('http'); @@ -123,14 +123,14 @@ const corsOptions = { methods: config.server?.cors?.methods || ['GET', 'POST'], }; -const httpsServer = https.createServer(options, app); -const io = socketIo(httpsServer, { +const server = httpolyglot.createServer(options, app); +const io = socketIo(server, { maxHttpBufferSize: 1e7, transports: ['websocket'], cors: corsOptions, }); -const host = 'https://' + 'localhost' + ':' + config.server.listen.port; // config.server.listen.ip +const host = config.server.hostUrl || `http://localhost:${config.server.listen.port}`; const jwtCfg = { JWT_KEY: (config.jwt && config.jwt.key) || 'mirotalksfu_jwt_secret', @@ -1148,7 +1148,7 @@ function startServer() { // START SERVER // #################################################### - httpsServer.listen(config.server.listen.port, () => { + server.listen(config.server.listen.port, () => { log.log( `%c diff --git a/app/src/config.template.js b/app/src/config.template.js index cf4ce0b9..392726bb 100644 --- a/app/src/config.template.js +++ b/app/src/config.template.js @@ -41,6 +41,7 @@ module.exports = { colors: true, }, server: { + hostUrl: '', // default to http://localhost:port listen: { // app listen on ip: '0.0.0.0', diff --git a/package.json b/package.json index 7bdc4e04..e1547d14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mirotalksfu", - "version": "1.6.45", + "version": "1.6.46", "description": "WebRTC SFU browser-based video calls", "main": "Server.js", "scripts": { @@ -65,8 +65,8 @@ "cors": "2.8.5", "crypto-js": "4.2.0", "discord.js": "^14.16.3", - "dompurify": "^3.2.2", - "express": "4.21.1", + "dompurify": "^3.2.3", + "express": "4.21.2", "express-openid-connect": "^2.17.1", "fluent-ffmpeg": "^2.1.3", "he": "^1.2.0", diff --git a/public/js/Room.js b/public/js/Room.js index 82fc70d2..d6de821f 100644 --- a/public/js/Room.js +++ b/public/js/Room.js @@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.45 + * @version 1.6.46 * */ diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js index 76d2d89e..655e6e1e 100644 --- a/public/js/RoomClient.js +++ b/public/js/RoomClient.js @@ -9,7 +9,7 @@ * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.45 + * @version 1.6.46 * */