[mirotalk] - add httpolyglot

2025-03-22 10:51:55 +01:00
parent ac68fba19f
commit cd915336b2
6 changed files with 28 additions and 55 deletions
@@ -1,15 +1,15 @@
-# Domain
+# App environment

-HOST=localhost
+NODE_ENV=development #development or production
+
+# HOST: Default to http://localhost:port
+
+HOST=

 # Signaling Server listen port

 PORT=3000

-# Enable self-signed certs (app/ssl)
-
-HTTPS=false # true or false
-
 # Trust Proxy

 TRUST_PROXY=false #true or false
@@ -21,6 +21,7 @@ dependencies: {
    express-openid-connect  : https://www.npmjs.com/package/express-openid-connect
    he                      : https://www.npmjs.com/package/he
    helmet                  : https://www.npmjs.com/package/helmet
+    httpolyglot             : https://www.npmjs.com/package/httpolyglot
    jsdom                   : https://www.npmjs.com/package/jsdom
    jsonwebtoken            : https://www.npmjs.com/package/jsonwebtoken
    js-yaml                 : https://www.npmjs.com/package/js-yaml
@@ -43,7 +44,7 @@ dependencies: {
 * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
 * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
 * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.4.88
+ * @version 1.4.89
 *
 */

@@ -53,8 +54,7 @@ require('dotenv').config();

 const { auth, requiresAuth } = require('express-openid-connect');
 const { Server } = require('socket.io');
-const http = require('http');
-const https = require('https');
+const httpolyglot = require('httpolyglot');
 const compression = require('compression');
 const express = require('express');
 const cors = require('cors');
@@ -81,49 +81,28 @@ const nodemailer = require('./lib/nodemailer');

 const packageJson = require('../../package.json');

-const domain = process.env.HOST || 'localhost';
-const isHttps = process.env.HTTPS == 'true'; // Use self-signed certificates instead of Certbot and Let's Encrypt
 const port = process.env.PORT || 3000; // must be the same to client.js signalingServerPort
-const host = `http${isHttps ? 's' : ''}://${domain}:${port}`;
+const host = process.env.HOST || `http://localhost:${port}`;

 const authHost = new Host(); // Authenticated IP by Login

-let server;
+// Define paths to the SSL key and certificate files
+const keyPath = path.join(__dirname, '../ssl/key.pem');
+const certPath = path.join(__dirname, '../ssl/cert.pem');

-if (isHttps) {
-    // Define paths to the SSL key and certificate files
-    const keyPath = path.join(__dirname, '../ssl/key.pem');
-    const certPath = path.join(__dirname, '../ssl/cert.pem');
+// Read SSL key and certificate files securely
+const options = {
+    key: fs.readFileSync(keyPath, 'utf-8'),
+    cert: fs.readFileSync(certPath, 'utf-8'),
+};

-    // Check if SSL key file exists
-    if (!fs.existsSync(keyPath)) {
-        log.error('SSL key file not found.');
-        process.exit(1); // Exit the application if the key file is missing
-    }
-
-    // Check if SSL certificate file exists
-    if (!fs.existsSync(certPath)) {
-        log.error('SSL certificate file not found.');
-        process.exit(1); // Exit the application if the certificate file is missing
-    }
-
-    // Read SSL key and certificate files securely
-    const options = {
-        key: fs.readFileSync(keyPath, 'utf-8'),
-        cert: fs.readFileSync(certPath, 'utf-8'),
-    };
-
-    // Create HTTPS server using self-signed certificates
-    server = https.createServer(options, app);
-} else {
-    server = http.createServer(app);
-}
+// Server both http and https
+const server = httpolyglot.createServer(options, app);

 // Trust Proxy
 const trustProxy = !!getEnvBoolean(process.env.TRUST_PROXY);

 // Cors
-
 const cors_origin = process.env.CORS_ORIGIN;
 const cors_methods = process.env.CORS_METHODS;

@@ -1018,7 +997,6 @@ function getServerConfig(tunnel = false) {
        host_protected: hostCfg.protected || hostCfg.user_auth ? hostCfg : false,
        presenters: roomPresenters,
        ip_whitelist: ipWhitelist.enabled ? ipWhitelist : false,
-        self_signed_certificate: isHttps,
        api_key_secret: api_key_secret,

        // Media and Connection Settings
@@ -1089,7 +1067,7 @@ server.listen(port, null, () => {
    );

    // https tunnel
-    if (ngrokEnabled && isHttps === false) {
+    if (ngrokEnabled) {
        ngrokStart();
    } else {
        log.info('Server config', getServerConfig());
@@ -2,7 +2,7 @@

 ![mirotalk-https](https.png)

-1. Generate a [self-signed certificate](https://en.wikipedia.org/wiki/Self-signed_certificate)
+Generate a [self-signed certificate](https://en.wikipedia.org/wiki/Self-signed_certificate)

 ```bash
 # install openssl 4 ubuntu
@@ -18,9 +18,3 @@ rm csr.pem

 # https://www.sslchecker.com/certdecoder
 ```
-
-2. Expose `server.js` on `https` using the self-signed certificate, edit the `.env` file
-
-```bash
-HTTPS=true
-```
@@ -1,6 +1,6 @@
 {
    "name": "mirotalk",
-    "version": "1.4.88",
+    "version": "1.4.89",
    "description": "A free WebRTC browser-based video call",
    "main": "server.js",
    "scripts": {
@@ -42,7 +42,7 @@
    "homepage": "https://github.com/miroslavpejic85/mirotalk",
    "dependencies": {
        "@mattermost/client": "10.6.0",
-        "@sentry/node": "^9.7.0",
+        "@sentry/node": "^9.8.0",
        "axios": "^1.8.4",
        "colors": "^1.4.0",
        "compression": "^1.8.0",
@@ -54,6 +54,7 @@
        "express-openid-connect": "^2.18.0",
        "he": "^1.2.0",
        "helmet": "^8.1.0",
+        "httpolyglot": "0.1.2",
        "jsdom": "^26.0.0",
        "jsonwebtoken": "^9.0.2",
        "js-yaml": "^4.1.0",
@@ -73,7 +73,7 @@ let brand = {
    },
    about: {
        imageUrl: '../images/mirotalk-logo.gif',
-        title: 'WebRTC P2P v1.4.88',
+        title: 'WebRTC P2P v1.4.89',
        html: `
            <button 
                id="support-button" 
@@ -15,7 +15,7 @@
 * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
 * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
 * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.4.88
+ * @version 1.4.89
 *
 */

@@ -11039,7 +11039,7 @@ function showAbout() {
    Swal.fire({
        background: swBg,
        position: 'center',
-        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.4.88',
+        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.4.89',
        imageUrl: brand.about?.imageUrl && brand.about.imageUrl.trim() !== '' ? brand.about.imageUrl : images.about,
        customClass: { image: 'img-about' },
        html: `