feat: v1.2.0 — auto-reconnect, recording, monitor bounds, WASAPI loopback
- Auto-reconnect: stream retries with exponential backoff (2s→30s max) on unexpected exit; stops only when user clicks Stop - Recording: global RecordingBar with folder picker, segment duration (min), per-stream checkbox, Select All; uses FFmpeg tee muxer for simultaneous SRT + segmented .ts file output - Monitor capture: PowerShell System.Windows.Forms.Screen gives exact pixel bounds (x/y/width/height); per-monitor deviceName is now unique (desktop_monitor_N); gdigrab uses -offset_x/-offset_y/-video_size - Window capture: windowTitle now explicitly propagated in handleVideoSelect - System audio: added WASAPI Loopback option (no VB-Audio required), existing virtual-audio-capturer kept as fallback - Reconnecting event forwarded to renderer; status shows "Reconnecting…" with attempt count in logs - IPC: pick-folder (dialog.showOpenDialog) and open-folder (shell.openPath) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
admin
+145
-112
@@ -1,74 +1,79 @@
|
||||
'use strict'
|
||||
const { EventEmitter } = require('events')
|
||||
const { spawn } = require('child_process')
|
||||
const path = require('path')
|
||||
const fs = require('fs')
|
||||
const { app } = require('electron')
|
||||
|
||||
class FFmpegManager extends EventEmitter {
|
||||
constructor() {
|
||||
super()
|
||||
this.streams = new Map() // id -> { process, config }
|
||||
this.streams = new Map() // id -> { process, config }
|
||||
this._manualStops = new Set() // IDs stopped by user (no reconnect)
|
||||
this._reconnectTimers = new Map() // id -> setTimeout handle
|
||||
this.tolbekProcess = null
|
||||
this.ffmpegPath = this._resolveFfmpegPath()
|
||||
}
|
||||
|
||||
_resolveFfmpegPath() {
|
||||
// 1. Check bundled ffmpeg in app resources
|
||||
const resourcesPath = process.resourcesPath || path.join(__dirname, '..')
|
||||
const candidates = [
|
||||
path.join(resourcesPath, 'ffmpeg-bin', process.platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'),
|
||||
path.join(__dirname, '..', 'ffmpeg-bin', process.platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'),
|
||||
]
|
||||
|
||||
for (const p of candidates) {
|
||||
if (fs.existsSync(p)) {
|
||||
console.log('[FFmpeg] Using bundled:', p)
|
||||
return p
|
||||
}
|
||||
if (fs.existsSync(p)) { console.log('[FFmpeg] Using bundled:', p); return p }
|
||||
}
|
||||
|
||||
// 2. Fallback to system ffmpeg
|
||||
console.log('[FFmpeg] Using system ffmpeg')
|
||||
return process.platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'
|
||||
}
|
||||
|
||||
// Build FFmpeg args for a stream config
|
||||
// ─── Build FFmpeg args ────────────────────────────────────────────────────────
|
||||
_buildStreamArgs(config) {
|
||||
const args = []
|
||||
const platform = process.platform
|
||||
|
||||
// === VIDEO INPUT ===
|
||||
const { videoSource, audioSource } = config
|
||||
|
||||
// ── VIDEO INPUT ──────────────────────────────────────────────────────────────
|
||||
if (videoSource.type === 'desktop') {
|
||||
// Screen capture
|
||||
if (platform === 'win32') {
|
||||
args.push('-f', 'gdigrab')
|
||||
const hideCursor = videoSource.hideCursor ? '0' : '1'
|
||||
args.push('-draw_mouse', hideCursor)
|
||||
args.push('-draw_mouse', videoSource.hideCursor ? '0' : '1')
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
|
||||
// Per-monitor capture: use stored bounds if available
|
||||
if (videoSource.monitorBounds) {
|
||||
const { x, y, width, height } = videoSource.monitorBounds
|
||||
args.push('-offset_x', String(x))
|
||||
args.push('-offset_y', String(y))
|
||||
args.push('-video_size', `${width}x${height}`)
|
||||
}
|
||||
args.push('-i', 'desktop')
|
||||
} else if (platform === 'darwin') {
|
||||
args.push('-f', 'avfoundation')
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
args.push('-capture_cursor', videoSource.hideCursor ? '0' : '1')
|
||||
args.push('-i', `${videoSource.screenIndex || '1'}:none`)
|
||||
args.push('-i', `${videoSource.screenIndex ?? '1'}:none`)
|
||||
} else {
|
||||
args.push('-f', 'x11grab')
|
||||
const display = process.env.DISPLAY || ':0'
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
if (videoSource.hideCursor) args.push('-draw_mouse', '0')
|
||||
args.push('-i', `${display}`)
|
||||
// Per-monitor: use bounds if available
|
||||
if (videoSource.monitorBounds) {
|
||||
const { x, y, width, height } = videoSource.monitorBounds
|
||||
args.push('-s', `${width}x${height}`)
|
||||
args.push('-i', `${display}+${x},${y}`)
|
||||
} else {
|
||||
args.push('-i', display)
|
||||
}
|
||||
}
|
||||
} else if (videoSource.type === 'window') {
|
||||
// Window capture
|
||||
if (platform === 'win32') {
|
||||
args.push('-f', 'gdigrab')
|
||||
args.push('-draw_mouse', videoSource.hideCursor ? '0' : '1')
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
args.push('-i', `title=${videoSource.windowTitle}`)
|
||||
args.push('-i', `title=${videoSource.windowTitle || videoSource.deviceName}`)
|
||||
} else if (platform === 'darwin') {
|
||||
// macOS window capture via avfoundation index
|
||||
args.push('-f', 'avfoundation')
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
args.push('-i', `${videoSource.deviceIndex || '1'}:none`)
|
||||
@@ -78,7 +83,6 @@ class FFmpegManager extends EventEmitter {
|
||||
args.push('-i', process.env.DISPLAY || ':0')
|
||||
}
|
||||
} else if (videoSource.type === 'device') {
|
||||
// Camera or capture card
|
||||
if (platform === 'win32') {
|
||||
args.push('-f', 'dshow')
|
||||
args.push('-framerate', String(config.framerate || 30))
|
||||
@@ -95,18 +99,17 @@ class FFmpegManager extends EventEmitter {
|
||||
if (config.resolution) args.push('-video_size', config.resolution)
|
||||
args.push('-i', videoSource.devicePath || '/dev/video0')
|
||||
}
|
||||
} else if (videoSource.type === 'none') {
|
||||
// No video - generate black frame
|
||||
} else {
|
||||
// No video — black frame
|
||||
args.push('-f', 'lavfi', '-i', 'color=black:640x480:rate=25')
|
||||
}
|
||||
|
||||
// === AUDIO INPUT ===
|
||||
// ── AUDIO INPUT ──────────────────────────────────────────────────────────────
|
||||
if (audioSource && audioSource.type !== 'none') {
|
||||
if (platform === 'win32') {
|
||||
if (audioSource.type === 'system') {
|
||||
// System audio loopback via wasapi
|
||||
args.push('-f', 'dshow')
|
||||
args.push('-i', `audio=${audioSource.deviceName}`)
|
||||
if (audioSource.deviceName === '__wasapi_loopback__') {
|
||||
// Native WASAPI loopback — captures all system audio, no extra software needed
|
||||
args.push('-f', 'wasapi', '-loopback', '1', '-i', '')
|
||||
} else {
|
||||
args.push('-f', 'dshow')
|
||||
args.push('-i', `audio=${audioSource.deviceName}`)
|
||||
@@ -116,7 +119,6 @@ class FFmpegManager extends EventEmitter {
|
||||
args.push('-i', `:${audioSource.deviceIndex || '0'}`)
|
||||
} else {
|
||||
if (audioSource.type === 'system') {
|
||||
// PulseAudio monitor for system audio
|
||||
args.push('-f', 'pulse')
|
||||
args.push('-i', audioSource.deviceName || 'default.monitor')
|
||||
} else {
|
||||
@@ -126,11 +128,10 @@ class FFmpegManager extends EventEmitter {
|
||||
}
|
||||
}
|
||||
|
||||
// === VIDEO ENCODING ===
|
||||
// ── VIDEO ENCODING ────────────────────────────────────────────────────────────
|
||||
const videoCodec = this._selectVideoCodec(config.hwAccel)
|
||||
args.push('-c:v', videoCodec)
|
||||
|
||||
// Codec-specific options
|
||||
if (videoCodec === 'h264_nvenc') {
|
||||
args.push('-preset', 'p4', '-tune', 'ull', '-rc', 'cbr')
|
||||
} else if (videoCodec === 'h264_qsv') {
|
||||
@@ -140,40 +141,49 @@ class FFmpegManager extends EventEmitter {
|
||||
} else if (videoCodec === 'h264_videotoolbox') {
|
||||
args.push('-realtime', '1')
|
||||
} else {
|
||||
// libx264 software
|
||||
args.push('-preset', 'ultrafast', '-tune', 'zerolatency')
|
||||
}
|
||||
|
||||
const videoBitrate = config.videoBitrate || '2000k'
|
||||
args.push('-b:v', videoBitrate)
|
||||
args.push('-maxrate', videoBitrate)
|
||||
args.push('-bufsize', videoBitrate)
|
||||
args.push('-b:v', videoBitrate, '-maxrate', videoBitrate, '-bufsize', videoBitrate)
|
||||
|
||||
if (config.resolution) {
|
||||
args.push('-vf', `scale=${config.resolution.replace('x', ':')}`)
|
||||
}
|
||||
args.push('-g', String((config.framerate || 30) * 2))
|
||||
|
||||
args.push('-g', String((config.framerate || 30) * 2)) // keyframe interval
|
||||
|
||||
// === AUDIO ENCODING ===
|
||||
// ── AUDIO ENCODING ────────────────────────────────────────────────────────────
|
||||
if (audioSource && audioSource.type !== 'none') {
|
||||
args.push('-c:a', 'aac')
|
||||
args.push('-b:a', config.audioBitrate || '128k')
|
||||
args.push('-ar', '44100')
|
||||
args.push('-c:a', 'aac', '-b:a', config.audioBitrate || '128k', '-ar', '44100')
|
||||
} else {
|
||||
args.push('-an')
|
||||
}
|
||||
|
||||
// === SRT OUTPUT ===
|
||||
// ── OUTPUT (SRT / tee with recording) ─────────────────────────────────────────
|
||||
const { serverAddress, port, srtMode, latency } = config
|
||||
const address = serverAddress.replace(/^(srt:\/\/|rtmp:\/\/|http:\/\/|https:\/\/)/, '')
|
||||
const lat = latency || 200
|
||||
const lat = latency || 200
|
||||
const mode = srtMode || 'caller'
|
||||
const srtUrl = `srt://${address}:${port}?mode=${mode}&latency=${lat * 1000}&pkt_size=1316`
|
||||
|
||||
let srtUrl = `srt://${address}:${port}?mode=${mode}&latency=${lat * 1000}&pkt_size=1316`
|
||||
if (config.record && config.recordFolder) {
|
||||
// Tee muxer: stream to SRT AND write segmented file simultaneously
|
||||
const segSecs = Math.max(1, config.recordSegmentMinutes || 60) * 60
|
||||
const safeName = (config.name || config.id).replace(/[^a-zA-Z0-9_-]/g, '_')
|
||||
|
||||
args.push('-f', 'mpegts')
|
||||
args.push(srtUrl)
|
||||
// Build file path — convert Windows backslashes, escape drive colon for tee muxer
|
||||
let folder = (config.recordFolder + '').replace(/\\/g, '/')
|
||||
if (process.platform === 'win32') {
|
||||
folder = folder.replace(/^([A-Za-z]):/, '$1\\:')
|
||||
}
|
||||
const filePath = `${folder}/${safeName}_%Y%m%d_%H%M%S.ts`
|
||||
const fileOpts = `f=segment:segment_time=${segSecs}:strftime=1:reset_timestamps=1`
|
||||
const teeOut = `[f=mpegts]${srtUrl}|[${fileOpts}]${filePath}`
|
||||
|
||||
args.push('-f', 'tee', teeOut)
|
||||
} else {
|
||||
args.push('-f', 'mpegts', srtUrl)
|
||||
}
|
||||
|
||||
return args
|
||||
}
|
||||
@@ -181,34 +191,51 @@ class FFmpegManager extends EventEmitter {
|
||||
_selectVideoCodec(hwAccel) {
|
||||
if (!hwAccel || hwAccel === 'none') return 'libx264'
|
||||
if (hwAccel === 'auto') {
|
||||
// Will be detected at runtime; return in preference order
|
||||
if (process.platform === 'darwin') return 'h264_videotoolbox'
|
||||
return 'h264_nvenc' // Will fallback in startStream if unavailable
|
||||
return 'h264_nvenc' // will fallback to software if unavailable
|
||||
}
|
||||
const codecMap = {
|
||||
'nvenc': 'h264_nvenc',
|
||||
'qsv': 'h264_qsv',
|
||||
'amf': 'h264_amf',
|
||||
'videotoolbox': 'h264_videotoolbox',
|
||||
'vaapi': 'h264_vaapi',
|
||||
'software': 'libx264'
|
||||
}
|
||||
return codecMap[hwAccel] || 'libx264'
|
||||
return {
|
||||
nvenc: 'h264_nvenc',
|
||||
qsv: 'h264_qsv',
|
||||
amf: 'h264_amf',
|
||||
videotoolbox: 'h264_videotoolbox',
|
||||
vaapi: 'h264_vaapi',
|
||||
software: 'libx264',
|
||||
}[hwAccel] || 'libx264'
|
||||
}
|
||||
|
||||
// ─── Public: start stream ────────────────────────────────────────────────────
|
||||
async startStream(config) {
|
||||
const { id } = config
|
||||
if (this.streams.has(id)) {
|
||||
this.stopStream(id)
|
||||
|
||||
// Cancel any pending reconnect timer
|
||||
if (this._reconnectTimers.has(id)) {
|
||||
clearTimeout(this._reconnectTimers.get(id))
|
||||
this._reconnectTimers.delete(id)
|
||||
}
|
||||
|
||||
const args = this._buildStreamArgs(config)
|
||||
console.log(`[FFmpeg] Starting stream ${id}:`, this.ffmpegPath, args.join(' '))
|
||||
// Kill existing process for this id if any
|
||||
if (this.streams.has(id)) {
|
||||
const existing = this.streams.get(id)
|
||||
try { existing.process.kill() } catch {}
|
||||
this.streams.delete(id)
|
||||
}
|
||||
|
||||
// Mark as NOT a manual stop (so reconnect will fire on unexpected exits)
|
||||
this._manualStops.delete(id)
|
||||
|
||||
return this._spawn(config, 0, true)
|
||||
}
|
||||
|
||||
// ─── Internal: spawn ffmpeg process ─────────────────────────────────────────
|
||||
_spawn(config, attempt, initial) {
|
||||
const { id } = config
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const proc = spawn(this.ffmpegPath, args, {
|
||||
stdio: ['pipe', 'pipe', 'pipe']
|
||||
})
|
||||
const args = this._buildStreamArgs(config)
|
||||
console.log(`[FFmpeg] Starting stream ${id} (attempt ${attempt}):`, this.ffmpegPath, args.join(' '))
|
||||
|
||||
const proc = spawn(this.ffmpegPath, args, { stdio: ['pipe', 'pipe', 'pipe'] })
|
||||
|
||||
let started = false
|
||||
let errorBuffer = ''
|
||||
@@ -220,38 +247,57 @@ class FFmpegManager extends EventEmitter {
|
||||
|
||||
if (!started && (text.includes('Output #0') || text.includes('frame='))) {
|
||||
started = true
|
||||
resolve({ pid: proc.pid })
|
||||
if (initial) resolve({ pid: proc.pid })
|
||||
}
|
||||
})
|
||||
|
||||
proc.on('error', (err) => {
|
||||
console.error(`[FFmpeg] Process error for ${id}:`, err)
|
||||
if (!started) reject(err)
|
||||
console.error(`[FFmpeg] Spawn error ${id}:`, err)
|
||||
if (initial && !started) reject(err)
|
||||
this.emit('error', { id, error: err.message })
|
||||
this.streams.delete(id)
|
||||
})
|
||||
|
||||
proc.on('exit', (code, signal) => {
|
||||
console.log(`[FFmpeg] Stream ${id} exited: code=${code} signal=${signal}`)
|
||||
console.log(`[FFmpeg] Stream ${id} exited: code=${code} signal=${signal} attempt=${attempt}`)
|
||||
const wasManual = this._manualStops.has(id)
|
||||
this.streams.delete(id)
|
||||
this.emit('ended', { id, code, signal })
|
||||
|
||||
// If hwAccel failed, retry with software encoding
|
||||
if (!started && code !== 0 && config.hwAccel !== 'software') {
|
||||
console.log(`[FFmpeg] HW encode failed for ${id}, retrying with software...`)
|
||||
this.startStream({ ...config, hwAccel: 'software' })
|
||||
.then(resolve)
|
||||
.catch(reject)
|
||||
} else if (!started) {
|
||||
// ── Initial start failed — try hwAccel fallback first ─────────────────
|
||||
if (initial && !started && code !== 0 && config.hwAccel !== 'software') {
|
||||
console.log(`[FFmpeg] HW encode failed for ${id}, retrying with software…`)
|
||||
this._spawn({ ...config, hwAccel: 'software' }, 0, true)
|
||||
.then(resolve).catch(reject)
|
||||
return
|
||||
}
|
||||
if (initial && !started) {
|
||||
reject(new Error(`FFmpeg exited with code ${code}\n${errorBuffer}`))
|
||||
return
|
||||
}
|
||||
|
||||
// ── Auto-reconnect on unexpected exit ─────────────────────────────────
|
||||
if (!wasManual) {
|
||||
const delayMs = Math.min(2000 * Math.pow(1.5, attempt), 30000)
|
||||
const nextAttempt = attempt + 1
|
||||
console.log(`[FFmpeg] Scheduling reconnect for ${id} in ${delayMs}ms (attempt ${nextAttempt})`)
|
||||
this.emit('reconnecting', { id, attempt: nextAttempt, delayMs })
|
||||
|
||||
const timer = setTimeout(() => {
|
||||
this._reconnectTimers.delete(id)
|
||||
if (!this._manualStops.has(id)) {
|
||||
this._spawn(config, nextAttempt, false)
|
||||
}
|
||||
}, delayMs)
|
||||
this._reconnectTimers.set(id, timer)
|
||||
}
|
||||
})
|
||||
|
||||
// Start timeout
|
||||
// Startup timeout — resolve even if FFmpeg hasn't printed "Output #0" yet
|
||||
setTimeout(() => {
|
||||
if (!started) {
|
||||
started = true
|
||||
resolve({ pid: proc.pid })
|
||||
if (initial) resolve({ pid: proc.pid })
|
||||
}
|
||||
}, 5000)
|
||||
|
||||
@@ -259,23 +305,27 @@ class FFmpegManager extends EventEmitter {
|
||||
})
|
||||
}
|
||||
|
||||
// ─── Public: stop stream ─────────────────────────────────────────────────────
|
||||
stopStream(id) {
|
||||
// Cancel any pending reconnect
|
||||
if (this._reconnectTimers.has(id)) {
|
||||
clearTimeout(this._reconnectTimers.get(id))
|
||||
this._reconnectTimers.delete(id)
|
||||
}
|
||||
|
||||
// Mark as manual stop so reconnect won't fire
|
||||
this._manualStops.add(id)
|
||||
|
||||
const stream = this.streams.get(id)
|
||||
if (stream) {
|
||||
console.log(`[FFmpeg] Stopping stream ${id}`)
|
||||
if (process.platform === 'win32') {
|
||||
stream.process.kill('SIGTERM')
|
||||
} else {
|
||||
stream.process.kill('SIGINT')
|
||||
}
|
||||
stream.process.kill(process.platform === 'win32' ? 'SIGTERM' : 'SIGINT')
|
||||
this.streams.delete(id)
|
||||
}
|
||||
}
|
||||
|
||||
stopAllStreams() {
|
||||
for (const [id] of this.streams) {
|
||||
this.stopStream(id)
|
||||
}
|
||||
for (const [id] of this.streams) this.stopStream(id)
|
||||
this.stopTolbek()
|
||||
}
|
||||
|
||||
@@ -285,20 +335,16 @@ class FFmpegManager extends EventEmitter {
|
||||
|
||||
getActiveStreams() {
|
||||
const result = []
|
||||
for (const [id, { config }] of this.streams) {
|
||||
result.push({ id, config })
|
||||
}
|
||||
for (const [id, { config }] of this.streams) result.push({ id, config })
|
||||
return result
|
||||
}
|
||||
|
||||
// === TOLBEK (SRT RECEIVER) ===
|
||||
// ─── Tolbek SRT Receiver ─────────────────────────────────────────────────────
|
||||
async startTolbek(config) {
|
||||
if (this.tolbekProcess) {
|
||||
this.stopTolbek()
|
||||
}
|
||||
if (this.tolbekProcess) this.stopTolbek()
|
||||
|
||||
const { port, latency, mode, serverAddress } = config
|
||||
const lat = (latency || 200) * 1000
|
||||
const lat = (latency || 200) * 1000
|
||||
const srtMode = mode || 'listener'
|
||||
|
||||
let srtUrl
|
||||
@@ -308,51 +354,38 @@ class FFmpegManager extends EventEmitter {
|
||||
const addr = (serverAddress || '').replace(/^srt:\/\//, '')
|
||||
srtUrl = `srt://${addr}:${port}?mode=caller&latency=${lat}`
|
||||
} else {
|
||||
// rendezvous
|
||||
const addr = (serverAddress || '0.0.0.0').replace(/^srt:\/\//, '')
|
||||
srtUrl = `srt://${addr}:${port}?mode=rendezvous&latency=${lat}`
|
||||
}
|
||||
|
||||
const args = [
|
||||
'-fflags', 'nobuffer',
|
||||
'-flags', 'low_delay',
|
||||
'-f', 'mpegts',
|
||||
'-i', srtUrl,
|
||||
'-fflags', 'nobuffer', '-flags', 'low_delay',
|
||||
'-f', 'mpegts', '-i', srtUrl,
|
||||
'-f', 'null', '-'
|
||||
]
|
||||
|
||||
console.log('[FFmpeg] Starting Tolbek receiver:', args.join(' '))
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const proc = spawn(this.ffmpegPath, args, {
|
||||
stdio: ['pipe', 'pipe', 'pipe']
|
||||
})
|
||||
|
||||
const proc = spawn(this.ffmpegPath, args, { stdio: ['pipe', 'pipe', 'pipe'] })
|
||||
let started = false
|
||||
|
||||
proc.stderr.on('data', (data) => {
|
||||
const text = data.toString()
|
||||
this.emit('log', { id: 'tolbek', text })
|
||||
if (!started) {
|
||||
started = true
|
||||
resolve({ pid: proc.pid })
|
||||
}
|
||||
if (!started) { started = true; resolve({ pid: proc.pid }) }
|
||||
})
|
||||
|
||||
proc.on('error', (err) => {
|
||||
if (!started) reject(err)
|
||||
this.emit('error', { id: 'tolbek', error: err.message })
|
||||
this.tolbekProcess = null
|
||||
})
|
||||
|
||||
proc.on('exit', (code) => {
|
||||
this.tolbekProcess = null
|
||||
this.emit('ended', { id: 'tolbek', code })
|
||||
})
|
||||
|
||||
setTimeout(() => {
|
||||
if (!started) { started = true; resolve({ pid: proc.pid }) }
|
||||
}, 3000)
|
||||
setTimeout(() => { if (!started) { started = true; resolve({ pid: proc.pid }) } }, 3000)
|
||||
|
||||
this.tolbekProcess = proc
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user