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

fixes #1005

Browse source 
The upstream gcp aggressively closes the connection once it has
received Content-Length bytes. However the @google-cloud/storage
module doesn't handle this well and emits no event in this case.
We were setting Content-Length because it's slightly more
efficient and was important for our download progress
bar (not anymore). The download should function fine without
setting the Content-Length, and allows the storage stream to finish
before closing the upstream socket.
This commit is contained in:
Danny Coates 2018-11-14 09:50:12 -08:00
parent e264d0da62
commit 6184a70ba4
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
4 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/api.js
View file

@ -162,8 +162,8 @@ function download(id, keychain, onprogress, canceller) {
});
xhr.addEventListener('progress', function(event) {
if (event.lengthComputable && event.target.status === 200) {
onprogress([event.loaded, event.total]);
if (event.target.status === 200) {
onprogress(event.loaded);
}
});
const auth = await keychain.authHeader();
@ -171,7 +171,7 @@ function download(id, keychain, onprogress, canceller) {
xhr.setRequestHeader('Authorization', auth);
xhr.responseType = 'blob';
xhr.send();
onprogress([0, 1]);
onprogress(0);
});
}

4
app/fileReceiver.js
View file

@ -47,7 +47,7 @@ export default class FileReceiver extends Nanobus {
this.fileInfo.name = meta.name;
this.fileInfo.type = meta.type;
this.fileInfo.iv = meta.iv;
this.fileInfo.size = meta.size;
this.fileInfo.size = +meta.size;
this.state = 'ready';
}
@ -57,7 +57,7 @@ export default class FileReceiver extends Nanobus {
this.fileInfo.id,
this.keychain,
p => {
this.progress = p;
this.progress = [p, this.fileInfo.size];
this.emit('progress');
}
);