natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vnext' into sw

This commit is contained in:
Danny Coates 2018-07-19 12:16:48 -07:00
parent 282cf0b595 f923ff4f87
commit 86f2a531d4
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/api.js
View File

@ -279,7 +279,6 @@ function download(id, keychain, onprogress, canceller) {
const auth = await keychain.authHeader();
xhr.open('get', `/api/download/${id}`);
xhr.setRequestHeader('Authorization', auth);
xhr.setRequestHeader('Connection', 'close');
xhr.responseType = 'blob';
xhr.send();
onprogress([0, 1]);

3
server/routes/download.js
View File

@ -21,10 +21,11 @@ module.exports = async function(req, res) {
file_stream.destroy();
});
file_stream.on('close', async () => {
file_stream.on('end', async () => {
if (cancelled) {
return;
}
const dl = meta.dl + 1;
const dlimit = meta.dlimit;
try {

18
test/frontend/tests/workflow-tests.js
View File

@ -135,7 +135,23 @@ describe('Upload / Download flow', function() {
}
});
it('can cancel and not increase download count', async function() {
it('can increase download count on download', async function() {
const fs = new FileSender(blob);
const file = await fs.upload();
const fr = new FileReceiver({
secretKey: file.toJSON().secretKey,
id: file.id,
nonce: file.keychain.nonce,
requiresPassword: false
});
await fr.getMetadata();
await fr.download(noSave);
await file.updateDownloadCount();
assert.equal(file.dtotal, 1);
});
it('does not increase download count when download cancelled', async function() {
const fs = new FileSender(blob);
const file = await fs.upload();
const fr = new FileReceiver({