Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Send appropriate HTTP code on pipeline error

Chocobozzz90a5461e61b0
diff --git a/server/core/controllers/download.ts b/server/core/controllers/download.ts
index 662ff26db2..7bd016638b 100644
--- a/server/core/controllers/download.ts
+++ b/server/core/controllers/download.ts
@@ -416,7 +416,16 @@ async function downloadLocalFileWithOptionalThrottle (options: {
res.setHeader('Content-Disposition', contentDisposition(encodeURI(downloadFilename)))
res.setHeader('Content-Type', 'application/octet-stream')
- await pipeline(createReadStream(path), new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip }), res)
+ const readStream = createReadStream(path)
+ readStream.on('error', err => {
+ if (res.headersSent) return
+
+ if ((err as any).code === 'ENOENT') return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+
+ return res.sendStatus(HttpStatusCode.INTERNAL_SERVER_ERROR_500)
+ })
+
+ await pipeline(readStream, new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip }), res)
}
async function redirectVideoDownloadToObjectStorage (options: {