improved stream close handling

merge pull request #238 from dumbmoron/stream-close-handling-2

package.json

@@ -1,7 +1,7 @@
 {
     "name": "cobalt",
     "description": "save what you love",
-    "version": "7.6.3",
+    "version": "7.6.5",
     "author": "wukko",
     "exports": "./src/cobalt.js",
     "type": "module",
@@ -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",

src/modules/stream/types.js

@@ -2,40 +2,71 @@ 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 closeRequest(controller) {
+    try { controller.abort() } catch {}
+}
+
+function closeResponse(res) {
     if (!res.headersSent) res.sendStatus(500);
     return res.destroy();
 }
 
+function killProcess(p) {
+    // ask the process to terminate itself gracefully
+    p?.kill('SIGTERM');
+    setTimeout(() => {
+        if (p?.exitCode === null)
+            // brutally murder the process if it didn't quit
+            p?.kill('SIGKILL');
+    }, 5000);
+}
+
+function pipe(from, to, done) {
+    from.on('error', done)
+        .on('close', done);
+
+    to.on('error', done)
+      .on('close', done);
+
+    from.pipe(to);
+}
+
 export async function streamDefault(streamInfo, res) {
+    const abortController = new AbortController();
+    const shutdown = () => (closeRequest(abortController), closeResponse(res));
+
     try {
-        let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1];
+        const filename = streamInfo.isAudioOnly ? `${streamInfo.filename}.${streamInfo.audioFormat}` : streamInfo.filename;
-        res.setHeader('Content-disposition', contentDisposition(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));
+        pipe(stream, res, shutdown);
-        stream.on('error', () => fail(res));
+    } catch {
-        stream.on('aborted', () => fail(res));
+        shutdown();
-    } catch (e) {
-        fail(res);
     }
 }
-export async function streamLiveRender(streamInfo, res) {
-    try {
-        if (streamInfo.urls.length !== 2) return fail(res);
 
-        let { body: audio } = await request(streamInfo.urls[1], {
+export async function streamLiveRender(streamInfo, res) {
-            maxRedirections: 16
+    let abortController = new AbortController(), process;
+    const shutdown = () => (closeRequest(abortController), killProcess(process), 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 +82,43 @@ 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'
             ],
         });
+
+        const [,,, audioInput, muxOutput] = process.stdio;
+
         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());
+        audio.on('error', shutdown);
-        ffmpegProcess.on('close', () => ffmpegProcess.kill());
+        audioInput.on('error', shutdown);
-        ffmpegProcess.on('exit', () => ffmpegProcess.kill());
+        audio.pipe(audioInput);
-        res.on('finish', () => ffmpegProcess.kill());
+        pipe(muxOutput, res, shutdown);
-        res.on('close', () => ffmpegProcess.kill());
-        ffmpegProcess.on('error', () => {
-            ffmpegProcess.kill();
-            fail(res);
-        });
 
-    } catch (e) {
+        process.on('close', shutdown);
-        fail(res);
+        res.on('finish', shutdown);
+    } catch {
+        shutdown();
     }
 }
+
 export function streamAudioOnly(streamInfo, res) {
+    let process;
+    const shutdown = () => (killProcess(process), 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,39 +129,39 @@ 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',
                 'pipe'
             ],
         });
+
+        const [,,, muxOutput] = process.stdio;
+
         res.setHeader('Connection', 'keep-alive');
         res.setHeader('Content-Disposition', contentDisposition(`${streamInfo.filename}.${streamInfo.audioFormat}`));
-        ffmpegProcess.stdio[3].pipe(res);
 
-        ffmpegProcess.on('disconnect', () => ffmpegProcess.kill());
+        pipe(muxOutput, res, shutdown);
-        ffmpegProcess.on('close', () => ffmpegProcess.kill());
+        res.on('finish', shutdown);
-        ffmpegProcess.on('exit', () => ffmpegProcess.kill());
+    } catch {
-        res.on('finish', () => ffmpegProcess.kill());
+        shutdown();
-        res.on('close', () => ffmpegProcess.kill());
-        ffmpegProcess.on('error', () => {
-            ffmpegProcess.kill();
-            fail(res);
-        });
-    } catch (e) {
-        fail(res);
     }
 }
+
 export function streamVideoOnly(streamInfo, res) {
+    let process;
+    const shutdown = () => (killProcess(process), closeResponse(res));
+
     try {
-        let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
+        let args = [
             '-loglevel', '-8',
             '-threads', `${getThreads()}`,
             '-i', streamInfo.urls,
@@ -153,29 +169,29 @@ export function streamVideoOnly(streamInfo, res) {
         ]
         if (streamInfo.mute) args.push('-an');
         if (streamInfo.service === "vimeo" || streamInfo.service === "rutube") args.push('-bsf:a', 'aac_adtstoasc');
+
+        let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1];
         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',
                 'pipe'
             ],
         });
+
+        const [,,, muxOutput] = process.stdio;
+
         res.setHeader('Connection', 'keep-alive');
         res.setHeader('Content-Disposition', contentDisposition(streamInfo.filename));
-        ffmpegProcess.stdio[3].pipe(res);
 
-        ffmpegProcess.on('disconnect', () => ffmpegProcess.kill());
+        pipe(muxOutput, res, shutdown);
-        ffmpegProcess.on('close', () => ffmpegProcess.kill());
+
-        ffmpegProcess.on('exit', () => ffmpegProcess.kill());
+        process.on('close', shutdown);
-        res.on('finish', () => ffmpegProcess.kill());
+        res.on('finish', shutdown);
-        res.on('close', () => ffmpegProcess.kill());
+    } catch {
-        ffmpegProcess.on('error', () => {
+        shutdown();
-            ffmpegProcess.kill();
-            fail(res);
-        });
-    } catch (e) {
-        fail(res);
     }
 }