dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into vnext

Browse source
This commit is contained in:
Danny Coates 2018-07-13 12:25:28 -07:00
commit dd0cb78ea2
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
48 changed files with 4748 additions and 7858 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/routes/download.js
View file

@ -14,8 +14,17 @@ module.exports = async function(req, res) {
'WWW-Authenticate': `send-v1 ${req.nonce}`
});
const file_stream = storage.get(id);
let cancelled = false;
file_stream.on('end', async () => {
req.on('close', () => {
cancelled = true;
file_stream.destroy();
});
file_stream.on('close', async () => {
if (cancelled) {
return;
}
const dl = meta.dl + 1;
const dlimit = meta.dlimit;
try {
@ -28,6 +37,7 @@ module.exports = async function(req, res) {
log.info('StorageError:', id);
}
});
file_stream.pipe(res);
} catch (e) {
res.sendStatus(404);