mirror of
https://github.com/imputnet/cobalt.git
synced 2024-12-29 11:06:10 +00:00
stream: improve shutdown handling, minor clean up
- try to close as many things as possible when shutting down - remove redundant (e.g. `exit` on process when listening for `close`) and straight up useless (`disconnect`) event listeners
This commit is contained in:
parent
73d84c09d3
commit
cae4a68aa4
|
@ -25,6 +25,7 @@
|
|||
},
|
||||
"homepage": "https://github.com/wukko/cobalt#readme",
|
||||
"dependencies": {
|
||||
"abort-controller": "3.0.0",
|
||||
"content-disposition-header": "0.6.0",
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^16.0.1",
|
||||
|
|
|
@ -2,40 +2,48 @@ import { spawn } from "child_process";
|
|||
import ffmpeg from "ffmpeg-static";
|
||||
import { ffmpegArgs, genericUserAgent } from "../config.js";
|
||||
import { getThreads, metadataManager } from "../sub/utils.js";
|
||||
import { request } from 'undici';
|
||||
import { request } from "undici";
|
||||
import { create as contentDisposition } from "content-disposition-header";
|
||||
import { AbortController } from "abort-controller"
|
||||
|
||||
function fail(res) {
|
||||
function closeResponse(res) {
|
||||
if (!res.headersSent) res.sendStatus(500);
|
||||
return res.destroy();
|
||||
}
|
||||
|
||||
export async function streamDefault(streamInfo, res) {
|
||||
const abortController = new AbortController();
|
||||
const shutdown = () => (abortController.abort(), closeResponse(res));
|
||||
|
||||
try {
|
||||
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1];
|
||||
res.setHeader('Content-disposition', contentDisposition(streamInfo.isAudioOnly ? `${streamInfo.filename}.${streamInfo.audioFormat}` : streamInfo.filename));
|
||||
const filename = streamInfo.isAudioOnly ? `${streamInfo.filename}.${streamInfo.audioFormat}` : streamInfo.filename;
|
||||
res.setHeader('Content-disposition', contentDisposition(filename));
|
||||
|
||||
const { body: stream, headers } = await request(streamInfo.urls, {
|
||||
headers: { 'user-agent': genericUserAgent },
|
||||
signal: abortController.signal,
|
||||
maxRedirections: 16
|
||||
});
|
||||
|
||||
res.setHeader('content-type', headers['content-type']);
|
||||
res.setHeader('content-length', headers['content-length']);
|
||||
|
||||
stream.pipe(res).on('error', () => fail(res));
|
||||
stream.on('error', () => fail(res));
|
||||
stream.on('aborted', () => fail(res));
|
||||
} catch (e) {
|
||||
fail(res);
|
||||
stream.on('error', shutdown)
|
||||
.pipe(res).on('error', shutdown);
|
||||
} catch {
|
||||
shutdown();
|
||||
}
|
||||
}
|
||||
export async function streamLiveRender(streamInfo, res) {
|
||||
try {
|
||||
if (streamInfo.urls.length !== 2) return fail(res);
|
||||
|
||||
let { body: audio } = await request(streamInfo.urls[1], {
|
||||
maxRedirections: 16
|
||||
export async function streamLiveRender(streamInfo, res) {
|
||||
let abortController = new AbortController(), process;
|
||||
const shutdown = () => (abortController.abort(), process?.kill(), closeResponse(res));
|
||||
|
||||
try {
|
||||
if (streamInfo.urls.length !== 2) return shutdown();
|
||||
|
||||
const { body: audio } = await request(streamInfo.urls[1], {
|
||||
maxRedirections: 16, signal: abortController.signal
|
||||
});
|
||||
|
||||
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1],
|
||||
|
@ -51,58 +59,41 @@ export async function streamLiveRender(streamInfo, res) {
|
|||
args = args.concat(ffmpegArgs[format]);
|
||||
if (streamInfo.metadata) args = args.concat(metadataManager(streamInfo.metadata));
|
||||
args.push('-f', format, 'pipe:4');
|
||||
let ffmpegProcess = spawn(ffmpeg, args, {
|
||||
|
||||
process = spawn(ffmpeg, args, {
|
||||
windowsHide: true,
|
||||
stdio: [
|
||||
'inherit', 'inherit', 'inherit',
|
||||
'pipe', 'pipe'
|
||||
],
|
||||
});
|
||||
|
||||
res.setHeader('Connection', 'keep-alive');
|
||||
res.setHeader('Content-Disposition', contentDisposition(streamInfo.filename));
|
||||
res.on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
ffmpegProcess.stdio[4].pipe(res).on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
audio.pipe(ffmpegProcess.stdio[3]).on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
|
||||
audio.on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
audio.on('aborted', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
|
||||
ffmpegProcess.on('disconnect', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('exit', () => ffmpegProcess.kill());
|
||||
res.on('finish', () => ffmpegProcess.kill());
|
||||
res.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
audio.on('error', shutdown)
|
||||
.pipe(process.stdio[3]).on('error', shutdown);
|
||||
|
||||
} catch (e) {
|
||||
fail(res);
|
||||
process.stdio[4].pipe(res).on('error', shutdown);
|
||||
process.on('close', shutdown);
|
||||
res.on('finish', shutdown);
|
||||
res.on('close', shutdown);
|
||||
} catch {
|
||||
shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
export function streamAudioOnly(streamInfo, res) {
|
||||
let process;
|
||||
const shutdown = () => (process?.kill(), closeResponse(res));
|
||||
|
||||
try {
|
||||
let args = [
|
||||
'-loglevel', '-8',
|
||||
'-threads', `${getThreads()}`,
|
||||
'-i', streamInfo.urls
|
||||
]
|
||||
|
||||
if (streamInfo.metadata) {
|
||||
if (streamInfo.metadata.cover) { // currently corrupts the audio
|
||||
args.push('-i', streamInfo.metadata.cover, '-map', '0:a', '-map', '1:0')
|
||||
|
@ -113,13 +104,14 @@ export function streamAudioOnly(streamInfo, res) {
|
|||
} else {
|
||||
args.push('-vn')
|
||||
}
|
||||
|
||||
let arg = streamInfo.copy ? ffmpegArgs["copy"] : ffmpegArgs["audio"];
|
||||
args = args.concat(arg);
|
||||
|
||||
if (ffmpegArgs[streamInfo.audioFormat]) args = args.concat(ffmpegArgs[streamInfo.audioFormat]);
|
||||
args.push('-f', streamInfo.audioFormat === "m4a" ? "ipod" : streamInfo.audioFormat, 'pipe:3');
|
||||
|
||||
const ffmpegProcess = spawn(ffmpeg, args, {
|
||||
process = spawn(ffmpeg, args, {
|
||||
windowsHide: true,
|
||||
stdio: [
|
||||
'inherit', 'inherit', 'inherit',
|
||||
|
@ -128,22 +120,20 @@ export function streamAudioOnly(streamInfo, res) {
|
|||
});
|
||||
res.setHeader('Connection', 'keep-alive');
|
||||
res.setHeader('Content-Disposition', contentDisposition(`${streamInfo.filename}.${streamInfo.audioFormat}`));
|
||||
ffmpegProcess.stdio[3].pipe(res);
|
||||
|
||||
ffmpegProcess.on('disconnect', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('exit', () => ffmpegProcess.kill());
|
||||
res.on('finish', () => ffmpegProcess.kill());
|
||||
res.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
} catch (e) {
|
||||
fail(res);
|
||||
process.stdio[3].pipe(res);
|
||||
process.on('close', shutdown);
|
||||
res.on('finish', shutdown);
|
||||
res.on('close', shutdown);
|
||||
} catch {
|
||||
shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
export function streamVideoOnly(streamInfo, res) {
|
||||
let process;
|
||||
const shutdown = () => (process?.kill(), closeResponse(res));
|
||||
|
||||
try {
|
||||
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
|
||||
'-loglevel', '-8',
|
||||
|
@ -155,7 +145,7 @@ export function streamVideoOnly(streamInfo, res) {
|
|||
if (streamInfo.service === "vimeo" || streamInfo.service === "rutube") args.push('-bsf:a', 'aac_adtstoasc');
|
||||
if (format === "mp4") args.push('-movflags', 'faststart+frag_keyframe+empty_moov');
|
||||
args.push('-f', format, 'pipe:3');
|
||||
const ffmpegProcess = spawn(ffmpeg, args, {
|
||||
process = spawn(ffmpeg, args, {
|
||||
windowsHide: true,
|
||||
stdio: [
|
||||
'inherit', 'inherit', 'inherit',
|
||||
|
@ -164,18 +154,12 @@ export function streamVideoOnly(streamInfo, res) {
|
|||
});
|
||||
res.setHeader('Connection', 'keep-alive');
|
||||
res.setHeader('Content-Disposition', contentDisposition(streamInfo.filename));
|
||||
ffmpegProcess.stdio[3].pipe(res);
|
||||
|
||||
ffmpegProcess.on('disconnect', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('exit', () => ffmpegProcess.kill());
|
||||
res.on('finish', () => ffmpegProcess.kill());
|
||||
res.on('close', () => ffmpegProcess.kill());
|
||||
ffmpegProcess.on('error', () => {
|
||||
ffmpegProcess.kill();
|
||||
fail(res);
|
||||
});
|
||||
} catch (e) {
|
||||
fail(res);
|
||||
process.stdio[3].pipe(res);
|
||||
process.on('close', shutdown);
|
||||
res.on('finish', shutdown);
|
||||
res.on('close', shutdown);
|
||||
} catch {
|
||||
shutdown();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue