feat: ajout proxy WebSocket pour LiveKit en mode HTTPS
Permet au client PWA charge en HTTPS de se connecter a LiveKit via proxy WSS. Modifications: - server/index.js: ajout proxy http-proxy-middleware - Route /livekit proxie vers http://localhost:7880 - Upgrade WebSocket active pour le proxy - server/package.json: ajout dependance http-proxy-middleware Fonctionnement: - Client HTTPS se connecte a wss://localhost:3000/livekit - Serveur Express proxie vers ws://localhost:7880 - Resout probleme mixed content (HTTPS ne peut pas WS)
This commit is contained in:
+28
-1
@@ -16,6 +16,7 @@ import configManager from './config/ConfigManager.js';
|
|||||||
import audioBridgeManager from './bridge/AudioBridgeManager.js';
|
import audioBridgeManager from './bridge/AudioBridgeManager.js';
|
||||||
import AudioLevelsServer from './websocket/AudioLevelsServer.js';
|
import AudioLevelsServer from './websocket/AudioLevelsServer.js';
|
||||||
import { setGlobalLogLevel } from './utils/Logger.js';
|
import { setGlobalLogLevel } from './utils/Logger.js';
|
||||||
|
import { createProxyMiddleware } from 'http-proxy-middleware';
|
||||||
|
|
||||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||||
|
|
||||||
@@ -378,6 +379,25 @@ apiRouter.get('/health', (req, res) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Proxy WebSocket pour LiveKit (wss → ws)
|
||||||
|
// Permet au client HTTPS de se connecter à LiveKit via le serveur Express
|
||||||
|
const livekitProxy = createProxyMiddleware({
|
||||||
|
target: 'http://localhost:7880',
|
||||||
|
changeOrigin: true,
|
||||||
|
ws: true, // Enable WebSocket proxying
|
||||||
|
pathRewrite: {
|
||||||
|
'^/livekit': '' // Remove /livekit prefix
|
||||||
|
},
|
||||||
|
onProxyReqWs: (proxyReq, req, socket) => {
|
||||||
|
log('debug', `🔀 Proxy WebSocket: ${req.url} → ws://localhost:7880`);
|
||||||
|
},
|
||||||
|
onError: (err, req, res) => {
|
||||||
|
log('error', `❌ Erreur proxy LiveKit: ${err.message}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.use('/livekit', livekitProxy);
|
||||||
|
|
||||||
// Monter le router API sous /api ET à la racine (rétrocompatibilité)
|
// Monter le router API sous /api ET à la racine (rétrocompatibilité)
|
||||||
app.use('/api', apiRouter);
|
app.use('/api', apiRouter);
|
||||||
app.use(apiRouter); // Routes accessibles aussi sans préfixe /api
|
app.use(apiRouter); // Routes accessibles aussi sans préfixe /api
|
||||||
@@ -492,7 +512,14 @@ async function start() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2.5 Démarrer WebSocket Audio Levels (même port que l'API)
|
// 2.5 Activer upgrade WebSocket pour proxy LiveKit
|
||||||
|
server.on('upgrade', (req, socket, head) => {
|
||||||
|
if (req.url.startsWith('/livekit')) {
|
||||||
|
livekitProxy.upgrade(req, socket, head);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2.6 Démarrer WebSocket Audio Levels (même port que l'API)
|
||||||
const audioLevelsServer = new AudioLevelsServer({ server });
|
const audioLevelsServer = new AudioLevelsServer({ server });
|
||||||
audioLevelsServer.start();
|
audioLevelsServer.start();
|
||||||
const wsProtocol = ENABLE_HTTPS ? 'wss' : 'ws';
|
const wsProtocol = ENABLE_HTTPS ? 'wss' : 'ws';
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"@livekit/rtc-node": "^0.13.28",
|
"@livekit/rtc-node": "^0.13.28",
|
||||||
"dotenv": "^17.4.2",
|
"dotenv": "^17.4.2",
|
||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
|
"http-proxy-middleware": "^4.1.1",
|
||||||
"livekit-server-sdk": "^2.6.0",
|
"livekit-server-sdk": "^2.6.0",
|
||||||
"opusscript": "^0.1.1",
|
"opusscript": "^0.1.1",
|
||||||
"qrcode-terminal": "^0.12.0",
|
"qrcode-terminal": "^0.12.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user