From e2d05a8f56c58ae93db3258346b05f6405366deb Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Thu, 16 Jan 2025 01:40:19 +0100 Subject: [PATCH] [mirotalksfu] - update rtmp servers and demo --- .../demo/client-server-axios/server/RtmpStreamer.js | 4 ++-- .../demo/client-server-axios/server/package.json | 8 ++++---- .../demo/client-server-socket/server/RtmpStreamer.js | 4 ++-- .../demo/client-server-socket/server/package.json | 10 +++++----- rtmpServers/node-media-server/Dockerfile | 2 +- .../node-media-server/docker-compose.template.yml | 2 -- rtmpServers/node-media-server/package.json | 6 +++--- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/rtmpServers/demo/client-server-axios/server/RtmpStreamer.js b/rtmpServers/demo/client-server-axios/server/RtmpStreamer.js index cfefebb9..ea6a5036 100644 --- a/rtmpServers/demo/client-server-axios/server/RtmpStreamer.js +++ b/rtmpServers/demo/client-server-axios/server/RtmpStreamer.js @@ -2,8 +2,8 @@ const { PassThrough } = require('stream'); const ffmpeg = require('fluent-ffmpeg'); -const ffmpegInstaller = require('@ffmpeg-installer/ffmpeg'); -ffmpeg.setFfmpegPath(ffmpegInstaller.path); +const ffmpegPath = '/usr/local/bin/ffmpeg'; // /usr/bin/ffmpeg (Linux) | /usr/local/bin/ffmpeg (Mac) +ffmpeg.setFfmpegPath(ffmpegPath); class RtmpStreamer { constructor(rtmpUrl, rtmpKey) { diff --git a/rtmpServers/demo/client-server-axios/server/package.json b/rtmpServers/demo/client-server-axios/server/package.json index fdaa18fa..ecdde995 100644 --- a/rtmpServers/demo/client-server-axios/server/package.json +++ b/rtmpServers/demo/client-server-axios/server/package.json @@ -1,6 +1,6 @@ { "name": "mirotalk-rtmp-streamer-server", - "version": "1.0.0", + "version": "1.0.1", "description": "MiroTalk RTMP Streamer Server", "main": "server.js", "scripts": { @@ -19,12 +19,12 @@ "license": "AGPLv3", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "cors": "2.8.5", "fluent-ffmpeg": "^2.1.3" }, "devDependencies": { - "uuid": "10.0.0", - "nodemon": "^3.1.4" + "uuid": "11.0.5", + "nodemon": "^3.1.9" } } diff --git a/rtmpServers/demo/client-server-socket/server/RtmpStreamer.js b/rtmpServers/demo/client-server-socket/server/RtmpStreamer.js index 3d4aa4af..b7488f50 100644 --- a/rtmpServers/demo/client-server-socket/server/RtmpStreamer.js +++ b/rtmpServers/demo/client-server-socket/server/RtmpStreamer.js @@ -2,8 +2,8 @@ const { PassThrough } = require('stream'); const ffmpeg = require('fluent-ffmpeg'); -const ffmpegInstaller = require('@ffmpeg-installer/ffmpeg'); -ffmpeg.setFfmpegPath(ffmpegInstaller.path); +const ffmpegPath = '/usr/local/bin/ffmpeg'; // /usr/bin/ffmpeg (Linux) | /usr/local/bin/ffmpeg (Mac) +ffmpeg.setFfmpegPath(ffmpegPath); class RtmpStreamer { constructor(rtmpUrl, rtmpKey, socket) { diff --git a/rtmpServers/demo/client-server-socket/server/package.json b/rtmpServers/demo/client-server-socket/server/package.json index eb32cdcc..28b460e7 100644 --- a/rtmpServers/demo/client-server-socket/server/package.json +++ b/rtmpServers/demo/client-server-socket/server/package.json @@ -1,6 +1,6 @@ { "name": "mirotalk-rtmp-server-streamer", - "version": "1.0.0", + "version": "1.0.1", "description": "MiroTalk RTMP Server Streamer", "main": "server.js", "scripts": { @@ -20,13 +20,13 @@ "license": "AGPLv3", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "fluent-ffmpeg": "^2.1.3", "cors": "2.8.5", - "socket.io": "4.7.5" + "socket.io": "4.8.1" }, "devDependencies": { - "uuid": "10.0.0", - "nodemon": "^3.1.4" + "uuid": "11.0.5", + "nodemon": "^3.1.9" } } diff --git a/rtmpServers/node-media-server/Dockerfile b/rtmpServers/node-media-server/Dockerfile index 0c4287ce..c0fbf584 100644 --- a/rtmpServers/node-media-server/Dockerfile +++ b/rtmpServers/node-media-server/Dockerfile @@ -1,5 +1,5 @@ # Use a lightweight Node.js image -FROM node:20-slim +FROM node:lts-slim # Set working directory WORKDIR /app diff --git a/rtmpServers/node-media-server/docker-compose.template.yml b/rtmpServers/node-media-server/docker-compose.template.yml index 67743b6e..18bcdb67 100644 --- a/rtmpServers/node-media-server/docker-compose.template.yml +++ b/rtmpServers/node-media-server/docker-compose.template.yml @@ -1,5 +1,3 @@ -version: '3' - services: mirotalk-nms: container_name: mirotalk-nms diff --git a/rtmpServers/node-media-server/package.json b/rtmpServers/node-media-server/package.json index 624e0dd8..4afae846 100644 --- a/rtmpServers/node-media-server/package.json +++ b/rtmpServers/node-media-server/package.json @@ -1,6 +1,6 @@ { "name": "mirotalk-rtmp-nms", - "version": "1.0.0", + "version": "1.0.1", "description": "MiroTalk RTMP Node Media Server", "main": "server.js", "scripts": { @@ -20,7 +20,7 @@ "node-media-server": "^2.7.0" }, "devDependencies": { - "uuid": "10.0.0", - "nodemon": "^3.1.4" + "uuid": "11.0.5", + "nodemon": "^3.1.9" } }